summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2016-03-14 11:01:50 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-05-04 14:48:58 -0700
commit4984953d536352b1d665edb9039ca311931622af (patch)
tree96c45a102f8f53f911ac360df70122549822cbf7 /arch/arm
parentc8b266e2fa59586a085caf9f50217e2e6e4b2659 (diff)
downloadlwn-4984953d536352b1d665edb9039ca311931622af.tar.gz
lwn-4984953d536352b1d665edb9039ca311931622af.zip
ARM: dts: am43xx: fix edma memcpy channel allocation
commit d41676ddddef27224a398609d874055866694cfa upstream. EDMA was allocating DMA channels 32 and 33 for memcpy usage, out of which channel 33 is actually used by DES crypto engine. This bad allocation of the channel causes a crash in the DES crypto engine, as the channel gets configured for memcpy usage instead of hardware <-> memory DMA. Fixed by allocating DMA channels 58 and 59 for memcpy usage (I2C0 RX/TX), which are not used by anybody. Fixes: cce1ee000187 ("ARM: DTS: am437x: Use the new DT bindings for the eDMA3") Signed-off-by: Tero Kristo <t-kristo@ti.com> Suggested-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am4372.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 92068fbf8b57..cdd3d7844804 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -207,7 +207,7 @@
ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
<&edma_tptc2 0>;
- ti,edma-memcpy-channels = <32 33>;
+ ti,edma-memcpy-channels = <58 59>;
};
edma_tptc0: tptc@49800000 {