[POWERPC] 83xx: USB device tree cleanups

[safe/jmp/linux-2.6] / arch / powerpc / boot / dts / mpc836x_mds.dts

diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 3b0873a..2181d2c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -20,6 +20,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               ethernet0 = &enet0;
+               ethernet1 = &enet1;
+               serial0 = &serial0;
+               serial1 = &serial1;
+               pci0 = &pci0;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -88,7 +96,8 @@
                        dfsrr;
                };
 
-               serial@4500 {
+               serial0: serial@4500 {
+                       cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <4500 100>;
@@ -97,7 +106,8 @@
                        interrupt-parent = < &ipic >;
                };
 
-               serial@4600 {
+               serial1: serial@4600 {
+                       cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <4600 100>;
@@ -231,7 +241,6 @@
                };
 
                usb@6c0 {
-                       device_type = "usb";
                        compatible = "qe_udc";
                        reg = <6c0 40 8B00 100>;
                        interrupts = <b>;
@@ -249,8 +258,8 @@
                        interrupts = <20>;
                        interrupt-parent = < &qeic >;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       rx-clock = <0>;
-                       tx-clock = <19>;
+                       rx-clock-name = "none";
+                       tx-clock-name = "clk9";
                        phy-handle = < &phy0 >;
                        phy-connection-type = "rgmii-id";
                        pio-handle = < &pio1 >;
@@ -266,8 +275,8 @@
                        interrupts = <21>;
                        interrupt-parent = < &qeic >;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       rx-clock = <0>;
-                       tx-clock = <14>;
+                       rx-clock-name = "none";
+                       tx-clock-name = "clk4";
                        phy-handle = < &phy1 >;
                        phy-connection-type = "rgmii-id";
                        pio-handle = < &pio2 >;
@@ -306,7 +315,8 @@
                };
        };
 
-       pci@e0008500 {
+       pci0: pci@e0008500 {
+               cell-index = <1>;
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <