Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / armada-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 281c6447e87272c0df44f89da6489876b8c9ade8..b8b84a22f0f3971b7013862821ecb0e2cfc237aa 100644 (file)
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -42,13 +42,14 @@
                                wt-override;
                        };
 
-                       interrupt-controller@20000 {
-                             reg = <0x20a00 0x2d0>, <0x21070 0x58>;
+                       i2c0: i2c@11000 {
+                               compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
+                               reg = <0x11000 0x100>;
                        };
 
-                       armada-370-xp-pmsu@22000 {
-                               compatible = "marvell,armada-370-xp-pmsu";
-                               reg = <0x22100 0x430>, <0x20800 0x20>;
+                       i2c1: i2c@11100 {
+                               compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
+                               reg = <0x11100 0x100>;
                        };
 
                        serial@12200 {
@@ -68,10 +69,16 @@
                                status = "disabled";
                        };
 
-                       timer@20300 {
-                               compatible = "marvell,armada-xp-timer";
-                               clocks = <&coreclk 2>, <&refclk>;
-                               clock-names = "nbclk", "fixed";
+                       system-controller@18200 {
+                               compatible = "marvell,armada-370-xp-system-controller";
+                               reg = <0x18200 0x500>;
+                       };
+
+                       gateclk: clock-gating-control@18220 {
+                               compatible = "marvell,armada-xp-gating-clock";
+                               reg = <0x18220 0x4>;
+                               clocks = <&coreclk 0>;
+                               #clock-cells = <1>;
                        };
 
                        coreclk: mvebu-sar@18230 {
@@ -80,6 +87,13 @@
                                #clock-cells = <1>;
                        };
 
+                       thermal@182b0 {
+                               compatible = "marvell,armadaxp-thermal";
+                               reg = <0x182b0 0x4
+                                       0x184d0 0x4>;
+                               status = "okay";
+                       };
+
                        cpuclk: clock-complex@18700 {
                                #clock-cells = <1>;
                                compatible = "marvell,armada-xp-cpu-clock";
@@ -87,16 +101,19 @@
                                clocks = <&coreclk 1>;
                        };
 
-                       gateclk: clock-gating-control@18220 {
-                               compatible = "marvell,armada-xp-gating-clock";
-                               reg = <0x18220 0x4>;
-                               clocks = <&coreclk 0>;
-                               #clock-cells = <1>;
+                       interrupt-controller@20000 {
+                             reg = <0x20a00 0x2d0>, <0x21070 0x58>;
                        };
 
-                       system-controller@18200 {
-                               compatible = "marvell,armada-370-xp-system-controller";
-                               reg = <0x18200 0x500>;
+                       timer@20300 {
+                               compatible = "marvell,armada-xp-timer";
+                               clocks = <&coreclk 2>, <&refclk>;
+                               clock-names = "nbclk", "fixed";
+                       };
+
+                       armada-370-xp-pmsu@22000 {
+                               compatible = "marvell,armada-370-xp-pmsu";
+                               reg = <0x22100 0x400>, <0x20800 0x20>;
                        };
 
                        eth2: ethernet@30000 {
@@ -107,6 +124,22 @@
                                status = "disabled";
                        };
 
+                       usb@50000 {
+                               clocks = <&gateclk 18>;
+                       };
+
+                       usb@51000 {
+                               clocks = <&gateclk 19>;
+                       };
+
+                       usb@52000 {
+                               compatible = "marvell,orion-ehci";
+                               reg = <0x52000 0x500>;
+                               interrupts = <47>;
+                               clocks = <&gateclk 20>;
+                               status = "disabled";
+                       };
+
                        xor@60900 {
                                compatible = "marvell,orion-xor";
                                reg = <0x60900 0x100
@@ -146,39 +179,6 @@
                                        dmacap,memset;
                                };
                        };
-
-                       i2c0: i2c@11000 {
-                               compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
-                               reg = <0x11000 0x100>;
-                       };
-
-                       i2c1: i2c@11100 {
-                               compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
-                               reg = <0x11100 0x100>;
-                       };
-
-                       usb@50000 {
-                               clocks = <&gateclk 18>;
-                       };
-
-                       usb@51000 {
-                               clocks = <&gateclk 19>;
-                       };
-
-                       usb@52000 {
-                               compatible = "marvell,orion-ehci";
-                               reg = <0x52000 0x500>;
-                               interrupts = <47>;
-                               clocks = <&gateclk 20>;
-                               status = "disabled";
-                       };
-
-                       thermal@182b0 {
-                               compatible = "marvell,armadaxp-thermal";
-                               reg = <0x182b0 0x4
-                                       0x184d0 0x4>;
-                               status = "okay";
-                       };
                };
        };