summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/spear1340.dtsi
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2018-01-11 11:28:52 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-22 15:42:18 +0100
commit349d03cb5378e97e6bfd4fed5c78d3bab115b36e (patch)
treea76e62cf778ef773a008beb89a06e19bdeb12086 /arch/arm/boot/dts/spear1340.dtsi
parentb1637c1236d0e0240277b616f94882022cd2a55e (diff)
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>
Diffstat (limited to 'arch/arm/boot/dts/spear1340.dtsi')
-rw-r--r--arch/arm/boot/dts/spear1340.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index 5f347054527d..d4dbc4098653 100644
--- 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";
};