Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdd10409 authored by Viresh Kumar's avatar Viresh Kumar Committed by Olof Johansson
Browse files

arm: spear13xx: Fix dmas cells 



The "dmas" cells for the designware DMA controller need to have only 3
properties apart from the phandle: request line, src master and
destination master. But the commit 6e8887f6 updated it incorrectly
while moving from platform code to DT. Fix it.

Cc: stable@vger.kernel.org # v3.10+
Fixes: 6e8887f6 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 6ffb5b4f

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

+1 −1
Original line number Diff line number Diff line
@@ -64,6 +64,6 @@ Example: 
		reg = <0xe0000000 0x1000>;

		interrupts = <0 35 0x4>;

		dmas = <&dmahost 12 0 1>,

			<&dmahost 13 0 1 0>;

			<&dmahost 13 1 0>;

		dma-names = "rx", "rx";

	};

arch/arm/boot/dts/spear1340.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -142,8 +142,8 @@ 
				reg = <0xb4100000 0x1000>;

				interrupts = <0 105 0x4>;

				status = "disabled";

				dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */

					<&dwdma0 0x680 0 1 0>; /* 0xD << 7 */

				dmas = <&dwdma0 12 0 1>,

					<&dwdma0 13 1 0>;

				dma-names = "tx", "rx";

			};

arch/arm/boot/dts/spear13xx.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
			reg = <0xb2800000 0x1000>;

			interrupts = <0 29 0x4>;

			status = "disabled";

			dmas = <&dwdma0 0 0 0 0>;

			dmas = <&dwdma0 0 0 0>;

			dma-names = "data";

		};
@@ -290,8 +290,8 @@ 
				#size-cells = <0>;

				interrupts = <0 31 0x4>;

				status = "disabled";

				dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */

					<&dwdma0 0x0280 0 0 0>;  /* 0x5 << 7 */

				dmas = <&dwdma0 4 0 0>,

					<&dwdma0 5 0 0>;

				dma-names = "tx", "rx";

			};