arm: dts: ls1028a: move the GPIO controller nodes into /soc

While inserting them into the new location, keep them sorted by the
register base offset just like in the linux kernel device tree.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index 349c4bf862b48b93ede8df9eee0641fa234acf15..9f466554e9a658bdeb4f782c0ebe86e5250addb2 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -190,39 +190,6 @@
                status = "disabled";
        };
 
-       gpio0: gpio@2300000 {
-               compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
-               reg = <0x0 0x2300000 0x0 0x10000>;
-               interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               little-endian;
-       };
-
-       gpio1: gpio@2310000 {
-               compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
-               reg = <0x0 0x2310000 0x0 0x10000>;
-               interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               little-endian;
-       };
-
-       gpio2: gpio@2320000 {
-               compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
-               reg = <0x0 0x2320000 0x0 0x10000>;
-               interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-               little-endian;
-       };
-
        sata: sata@3200000 {
                compatible = "fsl,ls1028a-ahci";
                reg = <0x0 0x3200000 0x0 0x10000        /* ccsr sata base */
@@ -484,5 +451,38 @@
                        little-endian;
                        status = "disabled";
                };
+
+               gpio0: gpio@2300000 {
+                       compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
+                       reg = <0x0 0x2300000 0x0 0x10000>;
+                       interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       little-endian;
+               };
+
+               gpio1: gpio@2310000 {
+                       compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
+                       reg = <0x0 0x2310000 0x0 0x10000>;
+                       interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       little-endian;
+               };
+
+               gpio2: gpio@2320000 {
+                       compatible = "fsl,ls1028a-gpio","fsl,qoriq-gpio";
+                       reg = <0x0 0x2320000 0x0 0x10000>;
+                       interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       little-endian;
+               };
        };
 };