Merge branch 'linus' into x86/i8259

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

diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 92711534b179941e66752884e90f11d660e28dfe..0e872a60e091fe34ec5757f5e1d0ce4ca2760f93 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -143,7 +143,6 @@
                        mode = "cpu";
                };
 
-               /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
                usb@23000 {
                        compatible = "fsl-usb2-dr";
                        reg = <0x23000 0x1000>;
@@ -151,7 +150,7 @@
                        #size-cells = <0>;
                        interrupt-parent = <&ipic>;
                        interrupts = <38 0x8>;
-                       phy_type = "utmi";
+                       phy_type = "ulpi";
                };
 
                mdio@24520 {
@@ -165,12 +164,6 @@
                                reg = <0x2>;
                                device_type = "ethernet-phy";
                        };
-                       phy3: ethernet-phy@3 {
-                               interrupt-parent = <&ipic>;
-                               interrupts = <18 0x8>;
-                               reg = <0x3>;
-                               device_type = "ethernet-phy";
-                       };
                };
 
                enet0: ethernet@24000 {
@@ -196,7 +189,7 @@
                        interrupts = <35 0x8 36 0x8 37 0x8>;
                        phy-connection-type = "mii";
                        interrupt-parent = <&ipic>;
-                       phy-handle = <&phy3>;
+                       fixed-link = <1 1 1000 0 0>;
                };
 
                serial0: serial@4500 {