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

Merge tag 'dmaengine-4.20-rc1' of git://git.infradead.org/users/vkoul/slave-dma 

Pull dmaengine updates from Vinod Koul:

 - Support for ColdFire mcf5441x edma controller

 - Support for link list mode in sprd dma

 - More users of managed dmaenginem_async_device_register API

 - Cyclic mode support in owl dma driver

 - DT updates for renesas drivers, dma-jz4780 updates and support for
   JZ4770, JZ4740 and JZ4725B controllers

 - Removal of deprecated dma_slave_config direction in dmaengine
   drivers, few more users will be removed in next cycle and eventually
   removed.

 - Minor updates to idma64, ioat, pxa, ppc drivers

* tag 'dmaengine-4.20-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (66 commits)
  dmaengine: ppc4xx: fix off-by-one build failure
  dmaengine: owl: Fix warnings generated during build
  dmaengine: fsl-edma: remove dma_slave_config direction usage
  dmaengine: rcar-dmac: set scatter/gather max segment size
  dmaengine: mmp_tdma: remove dma_slave_config direction usage
  dmaengine: ep93xx_dma: remove dma_slave_config direction usage
  dmaengine: k3dma: remove dma_slave_config direction usage
  dmaengine: k3dma: dont use direction for memcpy
  dmaengine: imx-dma: remove dma_slave_config direction usage
  dmaengine: idma: remove dma_slave_config direction usage
  dmaengine: hsu: remove dma_slave_config direction usage
  dmaengine: dw: remove dma_slave_config direction usage
  dmaengine: jz4740: remove dma_slave_config direction usage
  dmaengine: coh901318: remove dma_slave_config direction usage
  dmaengine: bcm2835: remove dma_slave_config direction usage
  dmaengine: at_hdmac: remove dma_slave_config direction usage
  dmaengine: owl: Add Slave and Cyclic mode support for Actions Semi Owl S900 SoC
  dmaengine: ioat: fix prototype of ioat_enumerate_channels
  dmaengine: stm32-dma: check whether length is aligned on FIFO threshold
  dt-bindings: dmaengine: usb-dmac: Add binding for r8a7744
  ...
parents 36168d71 71f021cf

Documentation/devicetree/bindings/dma/jz4780-dma.txt

+10 −4
Original line number Diff line number Diff line
@@ -2,8 +2,13 @@ 


Required properties:



- compatible: Should be "ingenic,jz4780-dma"

- reg: Should contain the DMA controller registers location and length.

- compatible: Should be one of:

  * ingenic,jz4740-dma

  * ingenic,jz4725b-dma

  * ingenic,jz4770-dma

  * ingenic,jz4780-dma

- reg: Should contain the DMA channel registers location and length, followed

  by the DMA controller registers location and length.

- interrupts: Should contain the interrupt specifier of the DMA controller.

- clocks: Should contain a clock specifier for the JZ4780 PDMA clock.

- #dma-cells: Must be <2>. Number of integer cells in the dmas property of
@@ -19,9 +24,10 @@ Optional properties: 


Example:



dma: dma@13420000 {

dma: dma-controller@13420000 {

	compatible = "ingenic,jz4780-dma";

	reg = <0x13420000 0x10000>;

	reg = <0x13420000 0x400

	       0x13421000 0x40>;



	interrupt-parent = <&intc>;

	interrupts = <10>;

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required Properties: 
- compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback.

	      Examples with soctypes are:

		- "renesas,dmac-r8a7743" (RZ/G1M)

		- "renesas,dmac-r8a7744" (RZ/G1N)

		- "renesas,dmac-r8a7745" (RZ/G1E)

		- "renesas,dmac-r8a77470" (RZ/G1C)

		- "renesas,dmac-r8a7790" (R-Car H2)

Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required Properties: 
-compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback.

	Examples with soctypes are:

	  - "renesas,r8a7743-usb-dmac" (RZ/G1M)

	  - "renesas,r8a7744-usb-dmac" (RZ/G1N)

	  - "renesas,r8a7745-usb-dmac" (RZ/G1E)

	  - "renesas,r8a7790-usb-dmac" (R-Car H2)

	  - "renesas,r8a7791-usb-dmac" (R-Car M2-W)

arch/mips/boot/dts/ingenic/jz4740.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -154,6 +154,21 @@ 
		clock-names = "baud", "module";

	};



	dmac: dma-controller@13020000 {

		compatible = "ingenic,jz4740-dma";

		reg = <0x13020000 0xbc

		       0x13020300 0x14>;

		#dma-cells = <2>;



		interrupt-parent = <&intc>;

		interrupts = <29>;



		clocks = <&cgu JZ4740_CLK_DMA>;



		/* Disable dmac until we have something that uses it */

		status = "disabled";

	};



	uhc: uhc@13030000 {

		compatible = "ingenic,jz4740-ohci", "generic-ohci";

		reg = <0x13030000 0x1000>;

arch/mips/boot/dts/ingenic/jz4770.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -196,6 +196,36 @@ 
		status = "disabled";

	};



	dmac0: dma-controller@13420000 {

		compatible = "ingenic,jz4770-dma";

		reg = <0x13420000 0xC0

		       0x13420300 0x20>;



		#dma-cells = <1>;



		clocks = <&cgu JZ4770_CLK_DMA>;

		interrupt-parent = <&intc>;

		interrupts = <24>;



		/* Disable dmac0 until we have something that uses it */

		status = "disabled";

	};



	dmac1: dma-controller@13420100 {

		compatible = "ingenic,jz4770-dma";

		reg = <0x13420100 0xC0

		       0x13420400 0x20>;



		#dma-cells = <1>;



		clocks = <&cgu JZ4770_CLK_DMA>;

		interrupt-parent = <&intc>;

		interrupts = <23>;



		/* Disable dmac1 until we have something that uses it */

		status = "disabled";

	};



	uhc: uhc@13430000 {

		compatible = "generic-ohci";

		reg = <0x13430000 0x1000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE