powerpc/86xx: Move gianfar mdio nodes under the ethernet nodes

Currently it doesn't matter where the mdio nodes are placed, but with
power management support (i.e. when sleep = <> properties will take
effect), mdio nodes placement will become important: mdio controller
is a part of the ethernet block, so the mdio nodes should be placed
correctly. Otherwise we may wrongly assume that MDIO controllers are
available during sleep.

Suggested-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

5 files changed, 231 insertions, 199 deletions

diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts
index 0ddfdfc7ab5f..d47ad0718759 100644
--- a/arch/powerpc/boot/dts/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/gef_ppc9a.dts
@@ -247,34 +247,37 @@
                         };
                 };
 
-                mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
-
-                        phy0: ethernet-phy@0 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x9 0x4>;
-                                reg = <1>;
-                        };
-                        phy2: ethernet-phy@2 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x8 0x4>;
-                                reg = <3>;
-                        };
-                };
-
                 enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "gmii";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x9 0x4>;
+                                        reg = <1>;
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x8 0x4>;
+                                        reg = <3>;
+                                };
+                        };
                 };
 
                 enet1: ethernet@26000 {
diff --git a/arch/powerpc/boot/dts/gef_sbc310.dts b/arch/powerpc/boot/dts/gef_sbc310.dts
index 09eeb438216b..1569117e5ddc 100644
--- a/arch/powerpc/boot/dts/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/gef_sbc310.dts
@@ -247,34 +247,37 @@
                         };
                 };
 
-                mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
-
-                        phy0: ethernet-phy@0 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x9 0x4>;
-                                reg = <1>;
-                        };
-                        phy2: ethernet-phy@2 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x8 0x4>;
-                                reg = <3>;
-                        };
-                };
-
                 enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "gmii";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x9 0x4>;
+                                        reg = <1>;
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x8 0x4>;
+                                        reg = <3>;
+                                };
+                        };
                 };
 
                 enet1: ethernet@26000 {
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts
index 714175ccb2a4..6582dbd36da7 100644
--- a/arch/powerpc/boot/dts/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -202,34 +202,37 @@
                         };
                 };
 
-                mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
-
-                        phy0: ethernet-phy@0 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x9 0x4>;
-                                reg = <1>;
-                        };
-                        phy2: ethernet-phy@2 {
-                                interrupt-parent = <&gef_pic>;
-                                interrupts = <0x8 0x4>;
-                                reg = <3>;
-                        };
-                };
-
                 enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "gmii";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x9 0x4>;
+                                        reg = <1>;
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&gef_pic>;
+                                        interrupts = <0x8 0x4>;
+                                        reg = <3>;
+                                };
+                        };
                 };
 
                 enet1: ethernet@26000 {
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 4481532cbe77..d72beb192460 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -180,133 +180,144 @@
                         };
                 };
 
-                mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
-
-                        phy0: ethernet-phy@0 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <0>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy1: ethernet-phy@1 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <1>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy2: ethernet-phy@2 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <2>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy3: ethernet-phy@3 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <3>;
-                                device_type = "ethernet-phy";
-                        };
-                        tbi0: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@25520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x25520 0x20>;
-
-                        tbi1: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@26520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x26520 0x20>;
-
-                        tbi2: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@27520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x27520 0x20>;
-
-                        tbi3: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-
                 enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <29 2 30  2 34 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@0 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy1: ethernet-phy@1 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <1>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy2: ethernet-phy@2 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <2>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy3: ethernet-phy@3 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <3>;
+                                        device_type = "ethernet-phy";
+                                };
+                                tbi0: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 enet1: ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <35 2 36 2 40 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi1>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi1: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
                 
                 enet2: ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <2>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x26000 0x1000>;
+                        ranges = <0x0 0x26000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <31 2 32 2 33 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi2>;
                         phy-handle = <&phy2>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi2: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 enet3: ethernet@27000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <3>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x27000 0x1000>;
+                        ranges = <0x0 0x27000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <37 2 38 2 39 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi3>;
                         phy-handle = <&phy3>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi3: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 serial0: serial@4500 {
diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts
index 36db981548e4..e3e914e78caa 100644
--- a/arch/powerpc/boot/dts/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -192,132 +192,144 @@
                         };
                 };
 
-                mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
-
-                        phy0: ethernet-phy@1f {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <0x1f>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy1: ethernet-phy@0 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <0>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy2: ethernet-phy@1 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <1>;
-                                device_type = "ethernet-phy";
-                        };
-                        phy3: ethernet-phy@2 {
-                                interrupt-parent = <&mpic>;
-                                interrupts = <10 1>;
-                                reg = <2>;
-                                device_type = "ethernet-phy";
-                        };
-                        tbi0: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@25520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x25520 0x20>;
-
-                        tbi1: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@26520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x26520 0x20>;
-
-                        tbi2: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
-                mdio@27520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x27520 0x20>;
-
-                        tbi3: tbi-phy@11 {
-                                reg = <0x11>;
-                                device_type = "tbi-phy";
-                        };
-                };
-
                 enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <29 2 30  2 34 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-mdio";
+                                reg = <0x520 0x20>;
+
+                                phy0: ethernet-phy@1f {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <0x1f>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy1: ethernet-phy@0 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy2: ethernet-phy@1 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <1>;
+                                        device_type = "ethernet-phy";
+                                };
+                                phy3: ethernet-phy@2 {
+                                        interrupt-parent = <&mpic>;
+                                        interrupts = <10 1>;
+                                        reg = <2>;
+                                        device_type = "ethernet-phy";
+                                };
+                                tbi0: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 enet1: ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <35 2 36 2 40 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi1>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi1: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 enet2: ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <2>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x26000 0x1000>;
+                        ranges = <0x0 0x26000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <31 2 32 2 33 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi2>;
                         phy-handle = <&phy2>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi2: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 enet3: ethernet@27000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         cell-index = <3>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <0x27000 0x1000>;
+                        ranges = <0x0 0x27000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <37 2 38 2 39 2>;
                         interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi3>;
                         phy-handle = <&phy3>;
                         phy-connection-type = "rgmii-id";
+
+                        mdio@520 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,gianfar-tbi";
+                                reg = <0x520 0x20>;
+
+                                tbi3: tbi-phy@11 {
+                                        reg = <0x11>;
+                                        device_type = "tbi-phy";
+                                };
+                        };
                 };
 
                 serial0: serial@4500 {