ARM: dts: armada-370-xp: move the cpurst node in the common file

The cpurst nodes are identical in armada-370.dtsi and armada-xp.dtsi
files, so move it in the common armada-370-xp.dtsi file.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 3ccedc9dffb2bf1be5355ab038fbf9da950a908d..1d8171380fa0e1befbc462a12ee394ceaa61d00f 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -228,6 +228,11 @@
                                reg = <0x20300 0x34>, <0x20704 0x4>;
                        };
 
+                       cpurst@20800 {
+                               compatible = "marvell,armada-370-cpu-reset";
+                               reg = <0x20800 0x8>;
+                       };
+
                        pmsu@22000 {
                                compatible = "marvell,armada-370-pmsu";
                                reg = <0x22000 0x1000>;

diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index b4258105e91f090c0230e7932fbebacd185af4aa..79b5463209aa9427ddfa9467c407c900ed397d01 100644 (file)
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -233,11 +233,6 @@
                                clocks = <&coreclk 2>;
                        };
 
-                       cpurst@20800 {
-                               compatible = "marvell,armada-370-cpu-reset";
-                               reg = <0x20800 0x8>;
-                       };
-
                        cpu-config@21000 {
                                compatible = "marvell,armada-370-cpu-config";
                                reg = <0x21000 0x8>;

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 4a5f99e65b512e1e1d9d77f6ae62fab9ef6c8415..e141de2a4a1cd2de36210f2d5370523c84c565f3 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -167,7 +167,6 @@
                        };
 
                        cpurst@20800 {
-                               compatible = "marvell,armada-370-cpu-reset";
                                reg = <0x20800 0x20>;
                        };