Commit e4c0fdd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull dmaengine updates from Vinod Koul:
 "A couple of new device support and small driver updates for this
  round.

  New support:
   - Intel idxd Wildcat Lake family support
   - SpacemiT K1 PDMA controller support
   - Renesas RZ/G3E family support

  Updates:
   - Xilinx shutdown support and dma client properties update
   - Designware edma callback_result support"

* tag 'dmaengine-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
  dt-bindings: dma: rz-dmac: Document RZ/G3E family of SoCs
  dmaengine: dw-edma: Set status for callback_result
  dmaengine: mv_xor: match alloc_wc and free_wc
  dmaengine: mmp_pdma: Add SpacemiT K1 PDMA support with 64-bit addressing
  dmaengine: mmp_pdma: Add operations structure for controller abstraction
  dmaengine: mmp_pdma: Add reset controller support
  dmaengine: mmp_pdma: Add clock support
  dt-bindings: dma: Add SpacemiT K1 PDMA controller
  dt-bindings: dmaengine: xilinx_dma: Remove DMA client properties
  dmaengine: Fix dma_async_tx_descriptor->tx_submit documentation
  dmaengine: xilinx_dma: Support descriptor setup from dma_vecs
  dmaengine: sh: setup_xref error handling
  dmaengine: Replace zero-length array with flexible-array
  dmaengine: ppc4xx: Remove space before newline
  dmaengine: idxd: Add a new IAA device ID for Wildcat Lake family platforms
  dmaengine: idxd: Replace memset(0) + strscpy() with strscpy_pad()
  dt-bindings: dma: nvidia,tegra20-apbdma: Add undocumented compatibles and "clock-names"
  dmaengine: zynqmp_dma: Add shutdown operation support
parents 1d1ba4d3 cc0bacac

Documentation/devicetree/bindings/dma/nvidia,tegra20-apbdma.yaml

+11 −1
Original line number Diff line number Diff line
@@ -18,10 +18,17 @@ maintainers: 
properties:

  compatible:

    oneOf:

      - const: nvidia,tegra20-apbdma

      - enum:

          - nvidia,tegra114-apbdma

          - nvidia,tegra20-apbdma

      - items:

          - const: nvidia,tegra30-apbdma

          - const: nvidia,tegra20-apbdma

      - items:

          - enum:

              - nvidia,tegra124-apbdma

              - nvidia,tegra210-apbdma

          - const: nvidia,tegra148-apbdma



  reg:

    maxItems: 1
@@ -32,6 +39,9 @@ properties: 
  clocks:

    maxItems: 1



  clock-names:

    const: dma



  interrupts:

    description:

      Should contain all of the per-channel DMA interrupts in

Documentation/devicetree/bindings/dma/renesas,rz-dmac.yaml

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ properties: 
              - renesas,r9a08g045-dmac # RZ/G3S

          - const: renesas,rz-dmac



      - items:

          - enum:

              - renesas,r9a09g047-dmac # RZ/G3E

          - const: renesas,r9a09g057-dmac



      - const: renesas,r9a09g057-dmac # RZ/V2H(P)



  reg:

Documentation/devicetree/bindings/dma/spacemit,k1-pdma.yaml

0 → 100644
+68 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/dma/spacemit,k1-pdma.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: SpacemiT K1 PDMA Controller



maintainers:

  - Guodong Xu <guodong@riscstar.com>



allOf:

  - $ref: dma-controller.yaml#



properties:

  compatible:

    const: spacemit,k1-pdma



  reg:

    maxItems: 1



  interrupts:

    description: Shared interrupt for all DMA channels

    maxItems: 1



  clocks:

    maxItems: 1



  resets:

    maxItems: 1



  dma-channels:

    maximum: 16



  '#dma-cells':

    const: 1

    description:

      The DMA request number for the peripheral device.



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - resets

  - dma-channels

  - '#dma-cells'



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/spacemit,k1-syscon.h>



    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        dma-controller@d4000000 {

            compatible = "spacemit,k1-pdma";

            reg = <0x0 0xd4000000 0x0 0x4000>;

            interrupts = <72>;

            clocks = <&syscon_apmu CLK_DMA>;

            resets = <&syscon_apmu RESET_DMA>;

            dma-channels = <16>;

            #dma-cells = <1>;

        };

    };

Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt

+0 −23
Original line number Diff line number Diff line
@@ -109,26 +109,3 @@ axi_vdma_0: axivdma@40030000 { 
		xlnx,datawidth = <0x40>;

	} ;

} ;
 




* DMA client



Required properties:

- dmas: a list of <[Video DMA device phandle] [Channel ID]> pairs,

	where Channel ID is '0' for write/tx and '1' for read/rx

	channel. For MCMDA, MM2S channel(write/tx) ID start from

	'0' and is in [0-15] range. S2MM channel(read/rx) ID start

	from '16' and is in [16-31] range. These channels ID are

	fixed irrespective of IP configuration.



- dma-names: a list of DMA channel names, one per "dmas" entry



Example:

++++++++



vdmatest_0: vdmatest@0 {

	compatible ="xlnx,axi-vdma-test-1.00.a";

	dmas = <&axi_vdma_0 0

		&axi_vdma_0 1>;

	dma-names = "vdma0", "vdma1";

} ;

drivers/dma/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ config MILBEAUT_XDMAC 


config MMP_PDMA

	tristate "MMP PDMA support"

	depends on ARCH_MMP || ARCH_PXA || COMPILE_TEST

	depends on ARCH_MMP || ARCH_PXA || ARCH_SPACEMIT || COMPILE_TEST

	select DMA_ENGINE

	help

	  Support the MMP PDMA engine for PXA and MMP platform.