Merge branch 'linus' into x86/urgent

[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / ksi8560.dts

diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts
index 3bfff47418db434c1520637b557d7812ad62b9ae..308fe7c29deaf662379baa3e1106a1b82b045cea 100644 (file)
--- a/arch/powerpc/boot/dts/ksi8560.dts
+++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -124,67 +124,72 @@
                        };
                };
 
-               mdio@24520 {                                    /* For TSECs */
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       compatible = "fsl,gianfar-mdio";
-                       reg = <0x24520 0x20>;
-
-                       PHY1: ethernet-phy@1 {
-                               interrupt-parent = <&mpic>;
-                               reg = <0x1>;
-                               device_type = "ethernet-phy";
-                       };
-
-                       PHY2: ethernet-phy@2 {
-                               interrupt-parent = <&mpic>;
-                               reg = <0x2>;
-                               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";
-                       };
-               };
-
-
                enet0: ethernet@24000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <0x24000 0x1000>;
+                       ranges = <0x0 0x24000 0x1000>;
                        /* Mac address filled in by bootwrapper */
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi0>;
                        phy-handle = <&PHY1>;
+
+                       mdio@520 {                                      /* For TSECs */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "fsl,gianfar-mdio";
+                               reg = <0x520 0x20>;
+
+                               PHY1: ethernet-phy@1 {
+                                       interrupt-parent = <&mpic>;
+                                       reg = <0x1>;
+                                       device_type = "ethernet-phy";
+                               };
+
+                               PHY2: ethernet-phy@2 {
+                                       interrupt-parent = <&mpic>;
+                                       reg = <0x2>;
+                                       device_type = "ethernet-phy";
+                               };
+
+                               tbi0: tbi-phy@11 {
+                                       reg = <0x11>;
+                                       device_type = "tbi-phy";
+                               };
+                       };
                };
 
                enet1: ethernet@25000 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <0x25000 0x1000>;
+                       ranges = <0x0 0x25000 0x1000>;
                        /* Mac address filled in by bootwrapper */
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi1>;
                        phy-handle = <&PHY2>;
+
+                       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";
+                               };
+                       };
                };
 
                mpic: pic@40000 {