[POWERPC] FSL: enet device tree cleanups

* Removed address fields in ethernet nodes
* Removed #address-cells, #size-cells from gianfar nodes
* Added cell-index to gianfar and ucc ethernet nodes
* Added enet[0..3] labels
* Renamed compatible node for gianfar mdio to "fsl,gianfar-mdio"
* Removed device_type = "mdio"

The matching for gianfar mdio still supports the old "mdio"/"gianfar" combo
but it is now considered deprecated.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

1 files changed, 4 insertions, 14 deletions

diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 91849dd64223..0c64381b61de 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -189,20 +189,15 @@
                         mode = "cpu";
                 };
 
-                ucc@3000 {
+                enet0: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <2>;
                         device-id = <2>;
                         reg = <3000 200>;
                         interrupts = <21>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * 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>;
@@ -210,20 +205,15 @@
                         pio-handle = <&ucc2pio>;
                 };
 
-                ucc@2200 {
+                enet1: ucc@2200 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <3>;
                         device-id = <3>;
                         reg = <2200 200>;
                         interrupts = <22>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * 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>;