Commit e2756618 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman

arm: spear13xx: Fix dmas cells

commit cdd10409 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 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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8bc0008
...@@ -58,6 +58,6 @@ Example: ...@@ -58,6 +58,6 @@ Example:
interrupts = <0 35 0x4>; interrupts = <0 35 0x4>;
status = "disabled"; status = "disabled";
dmas = <&dmahost 12 0 1>, dmas = <&dmahost 12 0 1>,
<&dmahost 13 0 1 0>; <&dmahost 13 1 0>;
dma-names = "rx", "rx"; dma-names = "rx", "rx";
}; };
...@@ -141,8 +141,8 @@ serial@b4100000 { ...@@ -141,8 +141,8 @@ serial@b4100000 {
reg = <0xb4100000 0x1000>; reg = <0xb4100000 0x1000>;
interrupts = <0 105 0x4>; interrupts = <0 105 0x4>;
status = "disabled"; status = "disabled";
dmas = <&dwdma0 0x600 0 0 1>, /* 0xC << 11 */ dmas = <&dwdma0 12 0 1>,
<&dwdma0 0x680 0 1 0>; /* 0xD << 7 */ <&dwdma0 13 1 0>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
}; };
......
...@@ -100,7 +100,7 @@ cf@b2800000 { ...@@ -100,7 +100,7 @@ cf@b2800000 {
reg = <0xb2800000 0x1000>; reg = <0xb2800000 0x1000>;
interrupts = <0 29 0x4>; interrupts = <0 29 0x4>;
status = "disabled"; status = "disabled";
dmas = <&dwdma0 0 0 0 0>; dmas = <&dwdma0 0 0 0>;
dma-names = "data"; dma-names = "data";
}; };
...@@ -288,8 +288,8 @@ spi0: spi@e0100000 { ...@@ -288,8 +288,8 @@ spi0: spi@e0100000 {
#size-cells = <0>; #size-cells = <0>;
interrupts = <0 31 0x4>; interrupts = <0 31 0x4>;
status = "disabled"; status = "disabled";
dmas = <&dwdma0 0x2000 0 0 0>, /* 0x4 << 11 */ dmas = <&dwdma0 4 0 0>,
<&dwdma0 0x0280 0 0 0>; /* 0x5 << 7 */ <&dwdma0 5 0 0>;
dma-names = "tx", "rx"; dma-names = "tx", "rx";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment