arm64: dts: marvell: re-order RTC nodes in Marvell CP110 description

In both the CP110 master and slave description, the node describing
the RTC was at the wrong place when taking into account increasing
register addresses. Interestingly, it was not even at the same (wrong)
place in both files.

This commit adjusts that, making the master and slave descriptions
more aligned.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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 3cd48552d69f3e75ab2936e22cbd23615a04c4f5..5e559ec88228d853b907123774a417832f359f16 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -115,6 +115,13 @@
                                msi-parent = <&gicp>;
                        };
 
+                       cpm_rtc: rtc@284000 {
+                               compatible = "marvell,armada-8k-rtc";
+                               reg = <0x284000 0x20>, <0x284080 0x24>;
+                               reg-names = "rtc", "rtc-soc";
+                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
                        cpm_syscon0: system-controller@440000 {
                                compatible = "syscon", "simple-mfd";
                                reg = <0x440000 0x1000>;
@@ -155,13 +162,6 @@
                                };
                        };
 
-                       cpm_rtc: rtc@284000 {
-                               compatible = "marvell,armada-8k-rtc";
-                               reg = <0x284000 0x20>, <0x284080 0x24>;
-                               reg-names = "rtc", "rtc-soc";
-                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
-                       };
-
                        cpm_sata0: sata@540000 {
                                compatible = "marvell,armada-8k-ahci",
                                             "generic-ahci";

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 892b594a62b9423aac3d50d72e6ab7f7b708d210..8bf99c24c9f50d9d0e4075e27f1160e69659e702 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -60,13 +60,6 @@
                        compatible = "simple-bus";
                        ranges = <0x0 0x0 0xf4000000 0x2000000>;
 
-                       cps_rtc: rtc@284000 {
-                               compatible = "marvell,armada-8k-rtc";
-                               reg = <0x284000 0x20>, <0x284080 0x24>;
-                               reg-names = "rtc", "rtc-soc";
-                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
-                       };
-
                        cps_ethernet: ethernet@0 {
                                compatible = "marvell,armada-7k-pp22";
                                reg = <0x0 0x100000>, <0x129000 0xb000>;
@@ -122,6 +115,13 @@
                                msi-parent = <&gicp>;
                        };
 
+                       cps_rtc: rtc@284000 {
+                               compatible = "marvell,armada-8k-rtc";
+                               reg = <0x284000 0x20>, <0x284080 0x24>;
+                               reg-names = "rtc", "rtc-soc";
+                               interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
                        cps_syscon0: system-controller@440000 {
                                compatible = "syscon", "simple-mfd";
                                reg = <0x440000 0x1000>;