Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

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

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index b55bced1593d845d62c238312f0cee0e8be16ecf..7c4beff3e20005784870c1e9bfb572b1ef907b9c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -123,7 +123,7 @@
                        #size-cells = <2>;
                        #address-cells = <3>;
                        reg = <8500 100>;
-                       compatible = "83xx";
+                       compatible = "fsl,mpc8349-pci";
                        device_type = "pci";
                };
 
@@ -231,7 +231,13 @@
                        reg = <3000 200>;
                        interrupts = <21>;
                        interrupt-parent = <&qeic>;
-                       mac-address = [ 00 04 9f ef 03 02 ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <20>;
                        tx-clock = <13>;
                        phy-handle = <&phy00>;
@@ -246,7 +252,13 @@
                        reg = <2200 200>;
                        interrupts = <22>;
                        interrupt-parent = <&qeic>;
-                       mac-address = [ 00 04 9f ef 03 01 ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        rx-clock = <19>;
                        tx-clock = <1a>;
                        phy-handle = <&phy04>;
@@ -265,14 +277,12 @@
                                interrupts = <0>;
                                reg = <0>;
                                device_type = "ethernet-phy";
-                               interface = <3>; //ENET_100_MII
                        };
                        phy04:ethernet-phy@04 {
                                interrupt-parent = <&pic>;
                                interrupts = <0>;
                                reg = <4>;
                                device_type = "ethernet-phy";
-                               interface = <3>;
                        };
                };