Commit 0b907305 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine 

Pull dmaengine updates from Vinod Koul:
 "New support:
   - TI J721S2 CSI BCDMA support

  Updates:
   - Native HDMI support for dw edma driver
   - ste dma40 updates for supporting proper SRAM handle in DT
   - removal of dma device chancnt setting in drivers"

* tag 'dmaengine-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (28 commits)
  dmaengine: sprd: Don't set chancnt
  dmaengine: hidma: Don't set chancnt
  dmaengine: plx_dma: Don't set chancnt
  dmaengine: axi-dmac: Don't set chancnt
  dmaengine: dw-axi-dmac: Don't set chancnt
  dmaengine: qcom: bam_dma: allow omitting num-{channels,ees}
  dmaengine: dw-edma: Add HDMA DebugFS support
  dmaengine: dw-edma: Add support for native HDMA
  dmaengine: dw-edma: Create a new dw_edma_core_ops structure to abstract controller operation
  dmaengine: dw-edma: Rename dw_edma_core_ops structure to dw_edma_plat_ops
  dmaengine: ste_dma40: use proper format string for resource_size_t
  dmaengine: make QCOM_HIDMA depend on HAS_IOMEM
  dmaengine: ste_dma40: fix typo in enum documentation
  dmaengine: ste_dma40: use correct print specfier for resource_size_t
  MAINTAINERS: Add myself as the DW eDMA driver reviewer
  MAINTAINERS: Add Manivannan to DW eDMA driver maintainers list
  MAINTAINERS: Demote Gustavo Pimentel to DW EDMA driver reviewer
  dmaengine: ti: k3-udma: Add support for J721S2 CSI BCDMA instance
  dt-bindings: dma: ti: Add J721S2 BCDMA
  dmaengine: ti: k3-psil-j721s2: Add PSI-L thread map for main CPSW2G
  ...
parents c91e587b 907514a7

Documentation/devicetree/bindings/dma/stericsson,dma40.yaml

+28 −8
Original line number Diff line number Diff line
@@ -112,14 +112,23 @@ properties: 
      - const: stericsson,dma40



  reg:

    items:

    oneOf:

      - items:

          - description: DMA40 memory base

      - items:

          - description: DMA40 memory base

      - description: LCPA memory base

          - description: LCPA memory base, deprecated, use eSRAM pool instead

        deprecated: true





  reg-names:

    items:

    oneOf:

      - items:

          - const: base

      - items:

          - const: base

          - const: lcpa

        deprecated: true



  interrupts:

    maxItems: 1
@@ -127,6 +136,15 @@ properties: 
  clocks:

    maxItems: 1



  sram:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description: A phandle array with inner size 1 (no arg cells).

      First phandle is the LCPA (Logical Channel Parameter Address) memory.

      Second phandle is the  LCLA (Logical Channel Link base Address) memory.

    maxItems: 2

    items:

      maxItems: 1



  memcpy-channels:

    $ref: /schemas/types.yaml#/definitions/uint32-array

    description: Array of u32 elements indicating which channels on the DMA
@@ -138,6 +156,7 @@ required: 
  - reg

  - interrupts

  - clocks

  - sram

  - memcpy-channels



additionalProperties: false
@@ -149,8 +168,9 @@ examples: 
    #include <dt-bindings/mfd/dbx500-prcmu.h>

    dma-controller@801c0000 {

        compatible = "stericsson,db8500-dma40", "stericsson,dma40";

        reg = <0x801c0000 0x1000>, <0x40010000 0x800>;

        reg-names = "base", "lcpa";

        reg = <0x801c0000 0x1000>;

        reg-names = "base";

        sram = <&lcpa>, <&lcla>;

        interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;

        #dma-cells = <3>;

        memcpy-channels = <56 57 58 59 60>;

Documentation/devicetree/bindings/dma/ti/k3-bcdma.yaml

+29 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
    enum:

      - ti,am62a-dmss-bcdma-csirx

      - ti,am64-dmss-bcdma

      - ti,j721s2-dmss-bcdma-csi



  reg:

    minItems: 3
@@ -151,7 +152,12 @@ allOf: 
      required:

        - power-domains



    else:

  - if:

      properties:

        compatible:

          contains:

            const: ti,am64-dmss-bcdma

    then:

      properties:

        reg:

          minItems: 5
@@ -168,6 +174,28 @@ allOf: 
        - ti,sci-rm-range-bchan

        - ti,sci-rm-range-tchan



  - if:

      properties:

        compatible:

          contains:

            const: ti,j721s2-dmss-bcdma-csi

    then:

      properties:

        ti,sci-rm-range-bchan: false



        reg:

          maxItems: 4



        reg-names:

          items:

            - const: gcfg

            - const: rchanrt

            - const: tchanrt

            - const: ringrt



      required:

        - ti,sci-rm-range-tchan



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ properties: 
  clock-names:

    const: axi_clk



  power-domains:

    maxItems: 1



required:

  - "#dma-cells"

  - compatible
@@ -48,12 +51,14 @@ required: 
  - interrupts

  - clocks

  - clock-names

  - power-domains



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/power/xlnx-zynqmp-power.h>



    dma: dma-controller@fd4c0000 {

      compatible = "xlnx,zynqmp-dpdma";
@@ -63,6 +68,7 @@ examples: 
      clocks = <&dpdma_clk>;

      clock-names = "axi_clk";

      #dma-cells = <1>;

      power-domains = <&zynqmp_firmware PD_DP>;

    };



...

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -5932,7 +5932,9 @@ S: Orphan 
F:	drivers/mtd/nand/raw/denali*









DESIGNWARE EDMA CORE IP DRIVER









M:	Gustavo Pimentel <gustavo.pimentel@synopsys.com>









M:	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>









R:	Gustavo Pimentel <gustavo.pimentel@synopsys.com>









R:	Serge Semin <fancer.lancer@gmail.com>









L:	dmaengine@vger.kernel.org









S:	Maintained









F:	drivers/dma/dw-edma/
































drivers/dma/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -553,6 +553,7 @@ config STE_DMA40







	bool "ST-Ericsson DMA40 support"









	depends on ARCH_U8500









	select DMA_ENGINE









	select SRAM









	help









	  Support for ST-Ericsson DMA40 controller