Pull cpuidle into release branch

[pandora-kernel.git] / arch / powerpc / boot / dts / mpc866ads.dts

diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index c0d06fd..90f2293 100644 (file)
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -15,12 +15,10 @@
        compatible = "mpc8xx";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,866@0 {
                        device_type = "cpu";
@@ -32,23 +30,19 @@
                        timebase-frequency = <0>;
                        bus-frequency = <0>;
                        clock-frequency = <0>;
-                       32-bit;
                        interrupts = <f 2>;     // decrementer interrupt
-                       interrupt-parent = <ff000000>;
-                       linux,phandle = <201>;
+                       interrupt-parent = <&Mpc8xx_pic>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 800000>;
        };
 
        soc866@ff000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
                ranges = <0 ff000000 00100000>;
                reg = <ff000000 00000200>;
@@ -57,11 +51,9 @@
                        device_type = "mdio";
                        compatible = "fs_enet";
                        reg = <e80 8>;
-                       linux,phandle = <e80>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       ethernet-phy@f {
-                               linux,phandle = <e800f>;
+                       phy: ethernet-phy@f {
                                reg = <f>;
                                device_type = "ethernet-phy";
                        };
@@ -75,26 +67,22 @@
                        reg = <e00 188>;
                        mac-address = [ 00 00 0C 00 01 FD ];
                        interrupts = <3 1>;
-                       interrupt-parent = <ff000000>;
-                       phy-handle = <e800f>;
+                       interrupt-parent = <&Mpc8xx_pic>;
+                       phy-handle = <&Phy>;
                };
 
-               pic@ff000000 {
-                       linux,phandle = <ff000000>;
+               mpc8xx_pic: pic@ff000000 {
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
                        reg = <0 24>;
-                       built-in;
                        device_type = "mpc8xx-pic";
                        compatible = "CPM";
                };
 
                cpm@ff000000 {
-                       linux,phandle = <ff000000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       #interrupt-cells = <2>;
                        device_type = "cpm";
                        model = "CPM";
                        ranges = <0 0 4000>;
@@ -102,17 +90,15 @@
                        command-proc = <9c0>;
                        brg-frequency = <0>;
                        interrupts = <0 2>;     // cpm error interrupt
-                       interrupt-parent = <930>;
+                       interrupt-parent = <&Cpm_pic>;
 
-                       pic@930 {
-                               linux,phandle = <930>;
+                       cpm_pic: pic@930 {
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
                                interrupts = <5 2 0 2>;
-                               interrupt-parent = <ff000000>;
+                               interrupt-parent = <&Mpc8xx_pic>;
                                reg = <930 20>;
-                               built-in;
                                device_type = "cpm-pic";
                                compatible = "CPM";
                        };
@@ -128,7 +114,7 @@
                                tx-clock = <1>;
                                current-speed = <0>;
                                interrupts = <4 3>;
-                               interrupt-parent = <930>;
+                               interrupt-parent = <&Cpm_pic>;
                        };
 
                        smc@a90 {
@@ -142,7 +128,7 @@
                                tx-clock = <2>;
                                current-speed = <0>;
                                interrupts = <3 3>;
-                               interrupt-parent = <930>;
+                               interrupt-parent = <&Cpm_pic>;
                        };
 
                        scc@a00 {
@@ -153,7 +139,7 @@
                                reg = <a00 18 3c00 80>;
                                mac-address = [ 00 00 0C 00 03 FD ];
                                interrupts = <1e 3>;
-                               interrupt-parent = <930>;
+                               interrupt-parent = <&Cpm_pic>;
                        };
                };
        };