Merge tag 'xfs-rmap-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / arm64 / boot / dts / marvell / armada-ap806.dtsi

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 20d256b..eab1a42 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -141,7 +141,7 @@
                        };
 
                        xor@400000 {
-                               compatible = "marvell,mv-xor-v2";
+                               compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x400000 0x1000>,
                                      <0x410000 0x1000>;
                                msi-parent = <&gic_v2m0>;
@@ -149,7 +149,7 @@
                        };
 
                        xor@420000 {
-                               compatible = "marvell,mv-xor-v2";
+                               compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x420000 0x1000>,
                                      <0x430000 0x1000>;
                                msi-parent = <&gic_v2m0>;
@@ -157,7 +157,7 @@
                        };
 
                        xor@440000 {
-                               compatible = "marvell,mv-xor-v2";
+                               compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x440000 0x1000>,
                                      <0x450000 0x1000>;
                                msi-parent = <&gic_v2m0>;
@@ -165,7 +165,7 @@
                        };
 
                        xor@460000 {
-                               compatible = "marvell,mv-xor-v2";
+                               compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x460000 0x1000>,
                                      <0x470000 0x1000>;
                                msi-parent = <&gic_v2m0>;