arm64: dts: ls1088a: Move fsl-mc node

The fsl-mc node should sit under the soc node, so move it to
its proper location.

Fixes: ac7c9ff741fb ("arm64: dts: ls1088a: add fsl-mc hardware resource manager node")
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
index 42a935b..f3ab53b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
@@ -173,77 +173,6 @@
                             <1 10 IRQ_TYPE_LEVEL_LOW>;/* Hypervisor PPI */
        };
 
-       fsl_mc: fsl-mc@80c000000 {
-               compatible = "fsl,qoriq-mc";
-               reg = <0x00000008 0x0c000000 0 0x40>,    /* MC portal base */
-                     <0x00000000 0x08340000 0 0x40000>; /* MC control reg */
-               msi-parent = <&its>;
-               #address-cells = <3>;
-               #size-cells = <1>;
-
-               /*
-                * Region type 0x0 - MC portals
-                * Region type 0x1 - QBMAN portals
-                */
-               ranges = <0x0 0x0 0x0 0x8 0x0c000000 0x4000000
-                         0x1 0x0 0x0 0x8 0x18000000 0x8000000>;
-
-               dpmacs {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       dpmac1: dpmac@1 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <1>;
-                       };
-
-                       dpmac2: dpmac@2 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <2>;
-                       };
-
-                       dpmac3: dpmac@3 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <3>;
-                       };
-
-                       dpmac4: dpmac@4 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <4>;
-                       };
-
-                       dpmac5: dpmac@5 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <5>;
-                       };
-
-                       dpmac6: dpmac@6 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <6>;
-                       };
-
-                       dpmac7: dpmac@7 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <7>;
-                       };
-
-                       dpmac8: dpmac@8 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <8>;
-                       };
-
-                       dpmac9: dpmac@9 {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <9>;
-                       };
-
-                       dpmac10: dpmac@a {
-                               compatible = "fsl,qoriq-mc-dpmac";
-                               reg = <0xa>;
-                       };
-               };
-       };
-
        psci {
                compatible = "arm,psci-0.2";
                method = "smc";
@@ -640,6 +569,77 @@
                        clocks = <&clockgen 4 3>, <&clockgen 4 3>;
                        clock-names = "apb_pclk", "wdog_clk";
                };
+
+               fsl_mc: fsl-mc@80c000000 {
+                       compatible = "fsl,qoriq-mc";
+                       reg = <0x00000008 0x0c000000 0 0x40>,    /* MC portal base */
+                             <0x00000000 0x08340000 0 0x40000>; /* MC control reg */
+                       msi-parent = <&its>;
+                       #address-cells = <3>;
+                       #size-cells = <1>;
+
+                       /*
+                        * Region type 0x0 - MC portals
+                        * Region type 0x1 - QBMAN portals
+                        */
+                       ranges = <0x0 0x0 0x0 0x8 0x0c000000 0x4000000
+                                 0x1 0x0 0x0 0x8 0x18000000 0x8000000>;
+
+                       dpmacs {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               dpmac1: dpmac@1 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <1>;
+                               };
+
+                               dpmac2: dpmac@2 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <2>;
+                               };
+
+                               dpmac3: dpmac@3 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <3>;
+                               };
+
+                               dpmac4: dpmac@4 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <4>;
+                               };
+
+                               dpmac5: dpmac@5 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <5>;
+                               };
+
+                               dpmac6: dpmac@6 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <6>;
+                               };
+
+                               dpmac7: dpmac@7 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <7>;
+                               };
+
+                               dpmac8: dpmac@8 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <8>;
+                               };
+
+                               dpmac9: dpmac@9 {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <9>;
+                               };
+
+                               dpmac10: dpmac@a {
+                                       compatible = "fsl,qoriq-mc-dpmac";
+                                       reg = <0xa>;
+                               };
+                       };
+               };
        };
 
        firmware {