arm: spear13xx: Fix dmas cells

commit cdd10409914184c7eee5ae3e11beb890c9c16c61 upstream.

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 6e8887f60f60 updated it incorrectly
while moving from platform code to DT. Fix it.

Cc: stable@vger.kernel.org # v3.10+
Fixes: 6e8887f60f60 ("ARM: SPEAr13xx: Pass generic DW DMAC platform data from DT")
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/devicetree/bindings/dma/snps-dma.txt b/Documentation/devicetree/bindings/dma/snps-dma.txt
index a122723907acb9be6fce0bd236eaa5e8f26191ca..99acc712f83aca5929bfe3ef8e8ecb3b8cfb0d4d 100644 (file)
--- a/Documentation/devicetree/bindings/dma/snps-dma.txt
+++ b/Documentation/devicetree/bindings/dma/snps-dma.txt
@@ -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";
        };

diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index 5f347054527def7bc99e5a62575e986d0d5b067a..d4dbc4098653e127bb55f1f5b6c9b477d0d541ac 100644 (file)
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -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";
                        };
 

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 17ea0abcdbd7c5bb2e3a529bdf33802362c54b74..086b4b3332494ba6dff43cee8de14c34518850d5 100644 (file)
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -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";
                        };