1 files changed, 7 insertions, 19 deletions

diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 73311e82ab5d..c5239c9f2759 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -119,11 +119,11 @@
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = < &ipic >;
                                 interrupts = <11 8>;
@@ -138,17 +138,12 @@
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <24000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <20 8 21 8 22 8>;
                         interrupt-parent = < &ipic >;
@@ -156,19 +151,12 @@
                         linux,network-index = <0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <25000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <23 8 24 8 25 8>;
                         interrupt-parent = < &ipic >;