arm: dts: fsl-ls1088a: move GPIO controller under "soc" per Linux

Move the GPIO controller definitions under the "soc" and in
the same relative position as the Linux kernel fsl-ls1088a.dtsi.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com> # on LS1088A-RDB

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index dc6241e20d99fe50f0b636a53594013482cd6bdf..06237a58f45d3c28a233b350cb13a0325deee945 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -168,6 +168,50 @@
                        status = "disabled";
                };
 
+               gpio0: gpio@2300000 {
+                       compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
+                       reg = <0x0 0x2300000 0x0 0x10000>;
+                       interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>;
+                       little-endian;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               gpio1: gpio@2310000 {
+                       compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
+                       reg = <0x0 0x2310000 0x0 0x10000>;
+                       interrupts = <0 36 IRQ_TYPE_LEVEL_HIGH>;
+                       little-endian;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               gpio2: gpio@2320000 {
+                       compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
+                       reg = <0x0 0x2320000 0x0 0x10000>;
+                       interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>;
+                       little-endian;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
+               gpio3: gpio@2330000 {
+                       compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
+                       reg = <0x0 0x2330000 0x0 0x10000>;
+                       interrupts = <0 37 IRQ_TYPE_LEVEL_HIGH>;
+                       little-endian;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+               };
+
                pcie1: pcie@3400000 {
                        compatible = "fsl,ls1088a-pcie";
                        reg = <0x00 0x03400000 0x0 0x00100000>, /* controller registers */
@@ -428,50 +472,6 @@
                bus-width = <4>;
        };
 
-       gpio0: gpio@2300000 {
-               compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
-               reg = <0x0 0x2300000 0x0 0x10000>;
-               interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-               little-endian;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-       };
-
-       gpio1: gpio@2310000 {
-               compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
-               reg = <0x0 0x2310000 0x0 0x10000>;
-               interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
-               little-endian;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-       };
-
-       gpio2: gpio@2320000 {
-               compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
-               reg = <0x0 0x2320000 0x0 0x10000>;
-               interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-               little-endian;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-       };
-
-       gpio3: gpio@2330000 {
-               compatible = "fsl,ls1088a-gpio", "fsl,qoriq-gpio";
-               reg = <0x0 0x2330000 0x0 0x10000>;
-               interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-               little-endian;
-               gpio-controller;
-               #gpio-cells = <2>;
-               interrupt-controller;
-               #interrupt-cells = <2>;
-       };
-
        ifc: ifc@1530000 {
                compatible = "fsl,ifc", "simple-bus";
                reg = <0x0 0x2240000 0x0 0x20000>;