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>

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 04ecfe6e2bc6e3c47210a9f5af18516b2e0b61d4..1230bfd01a7e4373571154b1c949550e91b2778e 100644 (file)
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -450,7 +450,7 @@
                        };
 
                        xor@60800 {
-                               compatible = "marvell,orion-xor";
+                               compatible = "marvell,armada-380-xor", "marvell,orion-xor";
                                reg = <0x60800 0x100
                                       0x60a00 0x100>;
                                clocks = <&gateclk 22>;
@@ -470,7 +470,7 @@
                        };
 
                        xor@60900 {
-                               compatible = "marvell,orion-xor";
+                               compatible = "marvell,armada-380-xor", "marvell,orion-xor";
                                reg = <0x60900 0x100
                                       0x60b00 0x100>;
                                clocks = <&gateclk 28>;

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index fc9864f85fc2b2f598bcd6edfcc52340f7ccc31c..619b79043eee3f9721424f1c2932e26bcb7897ca 100644 (file)
--- 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>;