arm64: dts: marvell: Fully re-order nodes in Marvell CP110 dtsi files

Since the introduction of the CP110 dt files, the sata node was
misplaced. Move it at the right place. Thanks to this, the files are
completely ordered.

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

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 5e559ec88228d853b907123774a417832f359f16..5586a732e1beafa025fb0d1b59a61ef1146b5a9d 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -162,15 +162,6 @@
                                };
                        };
 
-                       cpm_sata0: sata@540000 {
-                               compatible = "marvell,armada-8k-ahci",
-                                            "generic-ahci";
-                               reg = <0x540000 0x30000>;
-                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&cpm_clk 1 15>;
-                               status = "disabled";
-                       };
-
                        cpm_usb3_0: usb3@500000 {
                                compatible = "marvell,armada-8k-xhci",
                                             "generic-xhci";
@@ -191,6 +182,15 @@
                                status = "disabled";
                        };
 
+                       cpm_sata0: sata@540000 {
+                               compatible = "marvell,armada-8k-ahci",
+                                            "generic-ahci";
+                               reg = <0x540000 0x30000>;
+                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&cpm_clk 1 15>;
+                               status = "disabled";
+                       };
+
                        cpm_xor0: xor@6a0000 {
                                compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x6a0000 0x1000>,

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 8bf99c24c9f50d9d0e4075e27f1160e69659e702..4be43f1f5aa220b4ea19b5d4d6a4f1736f071cf8 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -163,15 +163,6 @@
 
                        };
 
-                       cps_sata0: sata@540000 {
-                               compatible = "marvell,armada-8k-ahci",
-                                            "generic-ahci";
-                               reg = <0x540000 0x30000>;
-                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
-                               clocks = <&cps_clk 1 15>;
-                               status = "disabled";
-                       };
-
                        cps_usb3_0: usb3@500000 {
                                compatible = "marvell,armada-8k-xhci",
                                             "generic-xhci";
@@ -192,6 +183,15 @@
                                status = "disabled";
                        };
 
+                       cps_sata0: sata@540000 {
+                               compatible = "marvell,armada-8k-ahci",
+                                            "generic-ahci";
+                               reg = <0x540000 0x30000>;
+                               interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&cps_clk 1 15>;
+                               status = "disabled";
+                       };
+
                        cps_xor0: xor@6a0000 {
                                compatible = "marvell,armada-7k-xor", "marvell,xor-v2";
                                reg = <0x6a0000 0x1000>,