summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/armada-39x.dtsi
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-17 14:12:21 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2015-07-09 14:25:28 +0200
commit449e1d649c52a80db73dd313dce92d6e191b801b (patch)
tree610b43085a2f11a8d0caa10f00fcccd8928e9215 /arch/arm/boot/dts/armada-39x.dtsi
parentLinux 4.2-rc1 (diff)
downloadlinux-449e1d649c52a80db73dd313dce92d6e191b801b.tar.xz
linux-449e1d649c52a80db73dd313dce92d6e191b801b.zip
ARM: mvebu: use armada-380-xor on Armada 38x and 39x
The Armada 38x and 39x SoC support have an updated XOR hardware block compared to previous SoCs. These features can be enabled by using the 'armada-380-xor' compatible string, available since commit 6f166312c6ea ("dmaengine: mv_xor: add support for a38x command in descriptor mode"). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-39x.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-39x.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index fc9864f85fc2..619b79043eee 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -325,7 +325,7 @@
};
xor@60800 {
- compatible = "marvell,orion-xor";
+ compatible = "marvell,armada-380-xor", "marvell,orion-xor";
reg = <0x60800 0x100
0x60a00 0x100>;
clocks = <&gateclk 22>;
@@ -345,7 +345,7 @@
};
xor@60900 {
- compatible = "marvell,orion-xor";
+ compatible = "marvell,armada-380-xor", "marvell,orion-xor";
reg = <0x60900 0x100
0x60b00 0x100>;
clocks = <&gateclk 28>;