Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=520948796335111cf91970efabca7e5d064db344
Commit:     520948796335111cf91970efabca7e5d064db344
Parent:     975b89399679dcf8587288d46d3f21d4286af167
Author:     Kumar Gala <[EMAIL PROTECTED]>
AuthorDate: Sat Feb 17 16:04:23 2007 -0600
Committer:  Kumar Gala <[EMAIL PROTECTED]>
CommitDate: Sat Feb 17 16:06:27 2007 -0600

    [POWERPC] 85xx: Cleaned up platform dts files
    
    * Fixed up top level compatible property for all boards
    * Removed explicit linux,phandle usage. Use references and labels now
    * Fixed phy-phandles for TSEC3/4 in mpc8548cds.dts
    
    Signed-off-by: Kumar Gala <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/dts/mpc8540ads.dts |  142 ++++++++++++++----------------
 arch/powerpc/boot/dts/mpc8541cds.dts |  108 +++++++++++-------------
 arch/powerpc/boot/dts/mpc8548cds.dts |  129 +++++++++++++---------------
 arch/powerpc/boot/dts/mpc8555cds.dts |  108 +++++++++++-------------
 arch/powerpc/boot/dts/mpc8560ads.dts |  157 ++++++++++++++++------------------
 arch/powerpc/boot/dts/mpc8568mds.dts |   96 +++++++++------------
 6 files changed, 333 insertions(+), 407 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts 
b/arch/powerpc/boot/dts/mpc8540ads.dts
index 5f41c1f..3c0917f 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -12,16 +12,14 @@
 
 / {
        model = "MPC8540ADS";
-       compatible = "MPC85xxADS";
+       compatible = "MPC8540ADS", "MPC85xxADS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 08000000>;      // 128M at 0x0
        };
 
@@ -58,7 +54,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -68,24 +64,20 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452003>;
-                               interrupt-parent = <40000>;
+                       phy3: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <37 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -102,8 +94,8 @@
                        address = [ 00 E0 0C 00 73 00 ];
                        local-mac-address = [ 00 E0 0C 00 73 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452000>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy0>;
                };
 
                [EMAIL PROTECTED] {
@@ -116,8 +108,8 @@
                        address = [ 00 E0 0C 00 73 01 ];
                        local-mac-address = [ 00 E0 0C 00 73 01 ];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy1>;
                };
 
                [EMAIL PROTECTED] {
@@ -130,8 +122,8 @@
                        address = [ 00 E0 0C 00 73 02 ];
                        local-mac-address = [ 00 E0 0C 00 73 02 ];
                        interrupts = <19 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452003>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy3>;
                };
 
                [EMAIL PROTECTED] {
@@ -140,7 +132,7 @@
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -149,85 +141,84 @@
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
                [EMAIL PROTECTED] {
-                       linux,phandle = <8000>;
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x02 */
-                               1000 0 0 1 40000 31 1
-                               1000 0 0 2 40000 32 1
-                               1000 0 0 3 40000 33 1
-                               1000 0 0 4 40000 34 1
+                               1000 0 0 1 &mpic 31 1
+                               1000 0 0 2 &mpic 32 1
+                               1000 0 0 3 &mpic 33 1
+                               1000 0 0 4 &mpic 34 1
 
                                /* IDSEL 0x03 */
-                               1800 0 0 1 40000 34 1
-                               1800 0 0 2 40000 31 1
-                               1800 0 0 3 40000 32 1
-                               1800 0 0 4 40000 33 1
+                               1800 0 0 1 &mpic 34 1
+                               1800 0 0 2 &mpic 31 1
+                               1800 0 0 3 &mpic 32 1
+                               1800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x04 */
-                               2000 0 0 1 40000 33 1
-                               2000 0 0 2 40000 34 1
-                               2000 0 0 3 40000 31 1
-                               2000 0 0 4 40000 32 1
+                               2000 0 0 1 &mpic 33 1
+                               2000 0 0 2 &mpic 34 1
+                               2000 0 0 3 &mpic 31 1
+                               2000 0 0 4 &mpic 32 1
 
                                /* IDSEL 0x05 */
-                               2800 0 0 1 40000 32 1
-                               2800 0 0 2 40000 33 1
-                               2800 0 0 3 40000 34 1
-                               2800 0 0 4 40000 31 1
+                               2800 0 0 1 &mpic 32 1
+                               2800 0 0 2 &mpic 33 1
+                               2800 0 0 3 &mpic 34 1
+                               2800 0 0 4 &mpic 31 1
 
                                /* IDSEL 0x0c */
-                               6000 0 0 1 40000 31 1
-                               6000 0 0 2 40000 32 1
-                               6000 0 0 3 40000 33 1
-                               6000 0 0 4 40000 34 1
+                               6000 0 0 1 &mpic 31 1
+                               6000 0 0 2 &mpic 32 1
+                               6000 0 0 3 &mpic 33 1
+                               6000 0 0 4 &mpic 34 1
 
                                /* IDSEL 0x0d */
-                               6800 0 0 1 40000 34 1
-                               6800 0 0 2 40000 31 1
-                               6800 0 0 3 40000 32 1
-                               6800 0 0 4 40000 33 1
+                               6800 0 0 1 &mpic 34 1
+                               6800 0 0 2 &mpic 31 1
+                               6800 0 0 3 &mpic 32 1
+                               6800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x0e */
-                               7000 0 0 1 40000 33 1
-                               7000 0 0 2 40000 34 1
-                               7000 0 0 3 40000 31 1
-                               7000 0 0 4 40000 32 1
+                               7000 0 0 1 &mpic 33 1
+                               7000 0 0 2 &mpic 34 1
+                               7000 0 0 3 &mpic 31 1
+                               7000 0 0 4 &mpic 32 1
 
                                /* IDSEL 0x0f */
-                               7800 0 0 1 40000 32 1
-                               7800 0 0 2 40000 33 1
-                               7800 0 0 3 40000 34 1
-                               7800 0 0 4 40000 31 1
+                               7800 0 0 1 &mpic 32 1
+                               7800 0 0 2 &mpic 33 1
+                               7800 0 0 3 &mpic 34 1
+                               7800 0 0 4 &mpic 31 1
 
                                /* IDSEL 0x12 */
-                               9000 0 0 1 40000 31 1
-                               9000 0 0 2 40000 32 1
-                               9000 0 0 3 40000 33 1
-                               9000 0 0 4 40000 34 1
+                               9000 0 0 1 &mpic 31 1
+                               9000 0 0 2 &mpic 32 1
+                               9000 0 0 3 &mpic 33 1
+                               9000 0 0 4 &mpic 34 1
 
                                /* IDSEL 0x13 */
-                               9800 0 0 1 40000 34 1
-                               9800 0 0 2 40000 31 1
-                               9800 0 0 3 40000 32 1
-                               9800 0 0 4 40000 33 1
+                               9800 0 0 1 &mpic 34 1
+                               9800 0 0 2 &mpic 31 1
+                               9800 0 0 3 &mpic 32 1
+                               9800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x14 */
-                               a000 0 0 1 40000 33 1
-                               a000 0 0 2 40000 34 1
-                               a000 0 0 3 40000 31 1
-                               a000 0 0 4 40000 32 1
+                               a000 0 0 1 &mpic 33 1
+                               a000 0 0 2 &mpic 34 1
+                               a000 0 0 3 &mpic 31 1
+                               a000 0 0 4 &mpic 32 1
 
                                /* IDSEL 0x15 */
-                               a800 0 0 1 40000 32 1
-                               a800 0 0 2 40000 33 1
-                               a800 0 0 3 40000 34 1
-                               a800 0 0 4 40000 31 1>;
-                       interrupt-parent = <40000>;
+                               a800 0 0 1 &mpic 32 1
+                               a800 0 0 2 &mpic 33 1
+                               a800 0 0 3 &mpic 34 1
+                               a800 0 0 4 &mpic 31 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <08 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
@@ -241,8 +232,7 @@
                        device_type = "pci";
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts 
b/arch/powerpc/boot/dts/mpc8541cds.dts
index 7be0bc6..2a1ae76 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -12,16 +12,14 @@
 
 / {
        model = "MPC8541CDS";
-       compatible = "MPC85xxCDS";
+       compatible = "MPC8541CDS", "MPC85xxCDS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 08000000>;      // 128M at 0x0
        };
 
@@ -58,7 +54,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -68,17 +64,14 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <1>;
                                device_type = "ethernet-phy";
@@ -94,8 +87,8 @@
                        reg = <24000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452000>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy0>;
                };
 
                [EMAIL PROTECTED] {
@@ -107,8 +100,8 @@
                        reg = <25000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 01 ];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy1>;
                };
 
                [EMAIL PROTECTED] {
@@ -117,7 +110,7 @@
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -126,57 +119,56 @@
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <8000>;
+               pci1: [EMAIL PROTECTED] {
                        interrupt-map-mask = <1f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x10 */
-                               08000 0 0 1 40000 30 1
-                               08000 0 0 2 40000 31 1
-                               08000 0 0 3 40000 32 1
-                               08000 0 0 4 40000 33 1
+                               08000 0 0 1 &mpic 30 1
+                               08000 0 0 2 &mpic 31 1
+                               08000 0 0 3 &mpic 32 1
+                               08000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x11 */
-                               08800 0 0 1 40000 30 1
-                               08800 0 0 2 40000 31 1
-                               08800 0 0 3 40000 32 1
-                               08800 0 0 4 40000 33 1
+                               08800 0 0 1 &mpic 30 1
+                               08800 0 0 2 &mpic 31 1
+                               08800 0 0 3 &mpic 32 1
+                               08800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 40000 30 1
-                               09000 0 0 2 40000 31 1
-                               09000 0 0 3 40000 32 1
-                               09000 0 0 4 40000 33 1
+                               09000 0 0 1 &mpic 30 1
+                               09000 0 0 2 &mpic 31 1
+                               09000 0 0 3 &mpic 32 1
+                               09000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 40000 31 1
-                               09800 0 0 2 40000 32 1
-                               09800 0 0 3 40000 33 1
-                               09800 0 0 4 40000 30 1
+                               09800 0 0 1 &mpic 31 1
+                               09800 0 0 2 &mpic 32 1
+                               09800 0 0 3 &mpic 33 1
+                               09800 0 0 4 &mpic 30 1
 
                                /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 40000 32 1
-                               0a000 0 0 2 40000 33 1
-                               0a000 0 0 3 40000 30 1
-                               0a000 0 0 4 40000 31 1
+                               0a000 0 0 1 &mpic 32 1
+                               0a000 0 0 2 &mpic 33 1
+                               0a000 0 0 3 &mpic 30 1
+                               0a000 0 0 4 &mpic 31 1
 
                                /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 40000 33 1
-                               0a800 0 0 2 40000 30 1
-                               0a800 0 0 3 40000 31 1
-                               0a800 0 0 4 40000 32 1
+                               0a800 0 0 1 &mpic 33 1
+                               0a800 0 0 2 &mpic 30 1
+                               0a800 0 0 3 &mpic 31 1
+                               0a800 0 0 4 &mpic 32 1
 
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 40000 30 1
-                               19000 0 0 2 40000 31 1
-                               19000 0 0 3 40000 32 1
-                               19000 0 0 4 40000 33 1>;
-                       interrupt-parent = <40000>;
+                               19000 0 0 1 &mpic 30 1
+                               19000 0 0 2 &mpic 31 1
+                               19000 0 0 3 &mpic 32 1
+                               19000 0 0 4 &mpic 33 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <08 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
@@ -200,21 +192,20 @@
                                compatible = "chrp,iic";
                                big-endian;
                                interrupts = <1>;
-                               interrupt-parent = <8000>;
+                               interrupt-parent = <&pci1>;
                        };
                };
 
                [EMAIL PROTECTED] {
-                       linux,phandle = <9000>;
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x15 */
-                               a800 0 0 1 40000 3b 1
-                               a800 0 0 2 40000 3b 1
-                               a800 0 0 3 40000 3b 1
-                               a800 0 0 4 40000 3b 1>;
-                       interrupt-parent = <40000>;
+                               a800 0 0 1 &mpic 3b 1
+                               a800 0 0 2 &mpic 3b 1
+                               a800 0 0 3 &mpic 3b 1
+                               a800 0 0 4 &mpic 3b 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <09 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
@@ -228,8 +219,7 @@
                        device_type = "pci";
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts 
b/arch/powerpc/boot/dts/mpc8548cds.dts
index 893d795..7eb5d81 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -12,16 +12,14 @@
 
 / {
        model = "MPC8548CDS";
-       compatible = "MPC85xxCDS";
+       compatible = "MPC8548CDS", "MPC85xxCDS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 08000000>;      // 128M at 0x0
        };
 
@@ -58,7 +54,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -68,32 +64,26 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452002>;
-                               interrupt-parent = <40000>;
+                       phy2: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452003>;
-                               interrupt-parent = <40000>;
+                       phy3: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -109,8 +99,8 @@
                        reg = <24000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452000>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy0>;
                };
 
                [EMAIL PROTECTED] {
@@ -122,10 +112,11 @@
                        reg = <25000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 01 ];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy1>;
                };
 
+/* eTSEC 3/4 are currently broken
                [EMAIL PROTECTED] {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -135,11 +126,10 @@
                        reg = <26000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 02 ];
                        interrupts = <f 2 10 2 11 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy2>;
                };
 
-/* eTSEC 4 is currently broken
                [EMAIL PROTECTED] {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -149,8 +139,8 @@
                        reg = <27000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 03 ];
                        interrupts = <15 2 16 2 17 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy3>;
                };
  */
 
@@ -160,7 +150,7 @@
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -169,57 +159,56 @@
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <8000>;
+               pci1: [EMAIL PROTECTED] {
                        interrupt-map-mask = <1f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x10 */
-                               08000 0 0 1 40000 30 1
-                               08000 0 0 2 40000 31 1
-                               08000 0 0 3 40000 32 1
-                               08000 0 0 4 40000 33 1
+                               08000 0 0 1 &mpic 30 1
+                               08000 0 0 2 &mpic 31 1
+                               08000 0 0 3 &mpic 32 1
+                               08000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x11 */
-                               08800 0 0 1 40000 30 1
-                               08800 0 0 2 40000 31 1
-                               08800 0 0 3 40000 32 1
-                               08800 0 0 4 40000 33 1
+                               08800 0 0 1 &mpic 30 1
+                               08800 0 0 2 &mpic 31 1
+                               08800 0 0 3 &mpic 32 1
+                               08800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 40000 30 1
-                               09000 0 0 2 40000 31 1
-                               09000 0 0 3 40000 32 1
-                               09000 0 0 4 40000 33 1
+                               09000 0 0 1 &mpic 30 1
+                               09000 0 0 2 &mpic 31 1
+                               09000 0 0 3 &mpic 32 1
+                               09000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 40000 31 1
-                               09800 0 0 2 40000 32 1
-                               09800 0 0 3 40000 33 1
-                               09800 0 0 4 40000 30 1
+                               09800 0 0 1 &mpic 31 1
+                               09800 0 0 2 &mpic 32 1
+                               09800 0 0 3 &mpic 33 1
+                               09800 0 0 4 &mpic 30 1
 
                                /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 40000 32 1
-                               0a000 0 0 2 40000 33 1
-                               0a000 0 0 3 40000 30 1
-                               0a000 0 0 4 40000 31 1
+                               0a000 0 0 1 &mpic 32 1
+                               0a000 0 0 2 &mpic 33 1
+                               0a000 0 0 3 &mpic 30 1
+                               0a000 0 0 4 &mpic 31 1
 
                                /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 40000 33 1
-                               0a800 0 0 2 40000 30 1
-                               0a800 0 0 3 40000 31 1
-                               0a800 0 0 4 40000 32 1
+                               0a800 0 0 1 &mpic 33 1
+                               0a800 0 0 2 &mpic 30 1
+                               0a800 0 0 3 &mpic 31 1
+                               0a800 0 0 4 &mpic 32 1
 
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 40000 30 1
-                               19000 0 0 2 40000 31 1
-                               19000 0 0 3 40000 32 1
-                               19000 0 0 4 40000 33 1>;
-                       interrupt-parent = <40000>;
+                               19000 0 0 1 &mpic 30 1
+                               19000 0 0 2 &mpic 31 1
+                               19000 0 0 3 &mpic 32 1
+                               19000 0 0 4 &mpic 33 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <08 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
@@ -243,21 +232,20 @@
                                compatible = "chrp,iic";
                                big-endian;
                                interrupts = <1>;
-                               interrupt-parent = <8000>;
+                               interrupt-parent = <&pci1>;
                        };
                };
 
                [EMAIL PROTECTED] {
-                       linux,phandle = <9000>;
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x15 */
-                               a800 0 0 1 40000 3b 1
-                               a800 0 0 2 40000 3b 1
-                               a800 0 0 3 40000 3b 1
-                               a800 0 0 4 40000 3b 1>;
-                       interrupt-parent = <40000>;
+                               a800 0 0 1 &mpic 3b 1
+                               a800 0 0 2 &mpic 3b 1
+                               a800 0 0 3 &mpic 3b 1
+                               a800 0 0 4 &mpic 3b 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <09 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
@@ -271,8 +259,7 @@
                        device_type = "pci";
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts 
b/arch/powerpc/boot/dts/mpc8555cds.dts
index 118f5a8..5f9c102 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -12,16 +12,14 @@
 
 / {
        model = "MPC8555CDS";
-       compatible = "MPC85xxCDS";
+       compatible = "MPC8555CDS", "MPC85xxCDS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 08000000>;      // 128M at 0x0
        };
 
@@ -58,7 +54,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -68,17 +64,14 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 0>;
                                reg = <1>;
                                device_type = "ethernet-phy";
@@ -94,8 +87,8 @@
                        reg = <24000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 00 ];
                        interrupts = <0d 2 0e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452000>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy0>;
                };
 
                [EMAIL PROTECTED] {
@@ -107,8 +100,8 @@
                        reg = <25000 1000>;
                        local-mac-address = [ 00 E0 0C 00 73 01 ];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy1>;
                };
 
                [EMAIL PROTECTED] {
@@ -117,7 +110,7 @@
                        reg = <4500 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -126,57 +119,56 @@
                        reg = <4600 100>;       // reg base, size
                        clock-frequency = <0>;  // should we fill in in uboot?
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <8000>;
+               pci1: [EMAIL PROTECTED] {
                        interrupt-map-mask = <1f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x10 */
-                               08000 0 0 1 40000 30 1
-                               08000 0 0 2 40000 31 1
-                               08000 0 0 3 40000 32 1
-                               08000 0 0 4 40000 33 1
+                               08000 0 0 1 &mpic 30 1
+                               08000 0 0 2 &mpic 31 1
+                               08000 0 0 3 &mpic 32 1
+                               08000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x11 */
-                               08800 0 0 1 40000 30 1
-                               08800 0 0 2 40000 31 1
-                               08800 0 0 3 40000 32 1
-                               08800 0 0 4 40000 33 1
+                               08800 0 0 1 &mpic 30 1
+                               08800 0 0 2 &mpic 31 1
+                               08800 0 0 3 &mpic 32 1
+                               08800 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 40000 30 1
-                               09000 0 0 2 40000 31 1
-                               09000 0 0 3 40000 32 1
-                               09000 0 0 4 40000 33 1
+                               09000 0 0 1 &mpic 30 1
+                               09000 0 0 2 &mpic 31 1
+                               09000 0 0 3 &mpic 32 1
+                               09000 0 0 4 &mpic 33 1
 
                                /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 40000 31 1
-                               09800 0 0 2 40000 32 1
-                               09800 0 0 3 40000 33 1
-                               09800 0 0 4 40000 30 1
+                               09800 0 0 1 &mpic 31 1
+                               09800 0 0 2 &mpic 32 1
+                               09800 0 0 3 &mpic 33 1
+                               09800 0 0 4 &mpic 30 1
 
                                /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 40000 32 1
-                               0a000 0 0 2 40000 33 1
-                               0a000 0 0 3 40000 30 1
-                               0a000 0 0 4 40000 31 1
+                               0a000 0 0 1 &mpic 32 1
+                               0a000 0 0 2 &mpic 33 1
+                               0a000 0 0 3 &mpic 30 1
+                               0a000 0 0 4 &mpic 31 1
 
                                /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 40000 33 1
-                               0a800 0 0 2 40000 30 1
-                               0a800 0 0 3 40000 31 1
-                               0a800 0 0 4 40000 32 1
+                               0a800 0 0 1 &mpic 33 1
+                               0a800 0 0 2 &mpic 30 1
+                               0a800 0 0 3 &mpic 31 1
+                               0a800 0 0 4 &mpic 32 1
 
                                /* Bus 1 (Tundra Bridge) */
                                /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 40000 30 1
-                               19000 0 0 2 40000 31 1
-                               19000 0 0 3 40000 32 1
-                               19000 0 0 4 40000 33 1>;
-                       interrupt-parent = <40000>;
+                               19000 0 0 1 &mpic 30 1
+                               19000 0 0 2 &mpic 31 1
+                               19000 0 0 3 &mpic 32 1
+                               19000 0 0 4 &mpic 33 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <08 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
@@ -200,21 +192,20 @@
                                compatible = "chrp,iic";
                                big-endian;
                                interrupts = <1>;
-                               interrupt-parent = <8000>;
+                               interrupt-parent = <&pci1>;
                        };
                };
 
                [EMAIL PROTECTED] {
-                       linux,phandle = <9000>;
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
 
                                /* IDSEL 0x15 */
-                               a800 0 0 1 40000 3b 1
-                               a800 0 0 2 40000 3b 1
-                               a800 0 0 3 40000 3b 1
-                               a800 0 0 4 40000 3b 1>;
-                       interrupt-parent = <40000>;
+                               a800 0 0 1 &mpic 3b 1
+                               a800 0 0 2 &mpic 3b 1
+                               a800 0 0 3 &mpic 3b 1
+                               a800 0 0 4 &mpic 3b 1>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <09 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 a0000000 a0000000 0 20000000
@@ -228,8 +219,7 @@
                        device_type = "pci";
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts 
b/arch/powerpc/boot/dts/mpc8560ads.dts
index c74d6eb..1050263 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -12,16 +12,14 @@
 
 / {
        model = "MPC8560ADS";
-       compatible = "MPC85xxADS";
+       compatible = "MPC8560ADS", "MPC85xxADS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -34,13 +32,11 @@
                        bus-frequency = <13ab6680>;
                        clock-frequency = <312c8040>;
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 10000000>;
        };
 
@@ -57,33 +53,28 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <35 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452002>;
-                               interrupt-parent = <40000>;
+                       phy2: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <37 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452003>;
-                               interrupt-parent = <40000>;
+                       phy3: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <37 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -97,8 +88,8 @@
                        reg = <24000 1000>;
                        address = [ 00 00 0C 00 00 FD ];
                        interrupts = <d 2 e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452000>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy0>;
                };
 
                [EMAIL PROTECTED] {
@@ -110,12 +101,11 @@
                        reg = <25000 1000>;
                        address = [ 00 00 0C 00 01 FD ];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452001>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy1>;
                };
 
                [EMAIL PROTECTED] {
-                       linux,phandle = <8000>;
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
@@ -127,96 +117,94 @@
                        interrupt-map = <
 
                                        /* IDSEL 0x2 */
-                                        1000 0 0 1 40000 31 1
-                                        1000 0 0 2 40000 32 1
-                                        1000 0 0 3 40000 33 1
-                                        1000 0 0 4 40000 34 1
+                                        1000 0 0 1 &mpic 31 1
+                                        1000 0 0 2 &mpic 32 1
+                                        1000 0 0 3 &mpic 33 1
+                                        1000 0 0 4 &mpic 34 1
 
                                        /* IDSEL 0x3 */
-                                        1800 0 0 1 40000 34 1
-                                        1800 0 0 2 40000 31 1
-                                        1800 0 0 3 40000 32 1
-                                        1800 0 0 4 40000 33 1
+                                        1800 0 0 1 &mpic 34 1
+                                        1800 0 0 2 &mpic 31 1
+                                        1800 0 0 3 &mpic 32 1
+                                        1800 0 0 4 &mpic 33 1
 
                                        /* IDSEL 0x4 */
-                                        2000 0 0 1 40000 33 1
-                                        2000 0 0 2 40000 34 1
-                                        2000 0 0 3 40000 31 1
-                                        2000 0 0 4 40000 32 1
+                                        2000 0 0 1 &mpic 33 1
+                                        2000 0 0 2 &mpic 34 1
+                                        2000 0 0 3 &mpic 31 1
+                                        2000 0 0 4 &mpic 32 1
 
                                        /* IDSEL 0x5  */
-                                        2800 0 0 1 40000 32 1
-                                        2800 0 0 2 40000 33 1
-                                        2800 0 0 3 40000 34 1
-                                        2800 0 0 4 40000 31 1
+                                        2800 0 0 1 &mpic 32 1
+                                        2800 0 0 2 &mpic 33 1
+                                        2800 0 0 3 &mpic 34 1
+                                        2800 0 0 4 &mpic 31 1
 
                                        /* IDSEL 12 */
-                                        6000 0 0 1 40000 31 1
-                                        6000 0 0 2 40000 32 1
-                                        6000 0 0 3 40000 33 1
-                                        6000 0 0 4 40000 34 1
+                                        6000 0 0 1 &mpic 31 1
+                                        6000 0 0 2 &mpic 32 1
+                                        6000 0 0 3 &mpic 33 1
+                                        6000 0 0 4 &mpic 34 1
 
                                        /* IDSEL 13 */
-                                        6800 0 0 1 40000 34 1
-                                        6800 0 0 2 40000 31 1
-                                        6800 0 0 3 40000 32 1
-                                        6800 0 0 4 40000 33 1
+                                        6800 0 0 1 &mpic 34 1
+                                        6800 0 0 2 &mpic 31 1
+                                        6800 0 0 3 &mpic 32 1
+                                        6800 0 0 4 &mpic 33 1
 
                                        /* IDSEL 14*/
-                                        7000 0 0 1 40000 33 1
-                                        7000 0 0 2 40000 34 1
-                                        7000 0 0 3 40000 31 1
-                                        7000 0 0 4 40000 32 1
+                                        7000 0 0 1 &mpic 33 1
+                                        7000 0 0 2 &mpic 34 1
+                                        7000 0 0 3 &mpic 31 1
+                                        7000 0 0 4 &mpic 32 1
 
                                        /* IDSEL 15 */
-                                        7800 0 0 1 40000 32 1
-                                        7800 0 0 2 40000 33 1
-                                        7800 0 0 3 40000 34 1
-                                        7800 0 0 4 40000 31 1
+                                        7800 0 0 1 &mpic 32 1
+                                        7800 0 0 2 &mpic 33 1
+                                        7800 0 0 3 &mpic 34 1
+                                        7800 0 0 4 &mpic 31 1
 
                                        /* IDSEL 18 */
-                                        9000 0 0 1 40000 31 1
-                                        9000 0 0 2 40000 32 1
-                                        9000 0 0 3 40000 33 1
-                                        9000 0 0 4 40000 34 1
+                                        9000 0 0 1 &mpic 31 1
+                                        9000 0 0 2 &mpic 32 1
+                                        9000 0 0 3 &mpic 33 1
+                                        9000 0 0 4 &mpic 34 1
 
                                        /* IDSEL 19 */
-                                        9800 0 0 1 40000 34 1
-                                        9800 0 0 2 40000 31 1
-                                        9800 0 0 3 40000 32 1
-                                        9800 0 0 4 40000 33 1
+                                        9800 0 0 1 &mpic 34 1
+                                        9800 0 0 2 &mpic 31 1
+                                        9800 0 0 3 &mpic 32 1
+                                        9800 0 0 4 &mpic 33 1
 
                                        /* IDSEL 20 */
-                                        a000 0 0 1 40000 33 1
-                                        a000 0 0 2 40000 34 1
-                                        a000 0 0 3 40000 31 1
-                                        a000 0 0 4 40000 32 1
+                                        a000 0 0 1 &mpic 33 1
+                                        a000 0 0 2 &mpic 34 1
+                                        a000 0 0 3 &mpic 31 1
+                                        a000 0 0 4 &mpic 32 1
 
                                        /* IDSEL 21 */
-                                        a800 0 0 1 40000 32 1
-                                        a800 0 0 2 40000 33 1
-                                        a800 0 0 3 40000 34 1
-                                        a800 0 0 4 40000 31 1>;
+                                        a800 0 0 1 &mpic 32 1
+                                        a800 0 0 2 &mpic 33 1
+                                        a800 0 0 3 &mpic 34 1
+                                        a800 0 0 4 &mpic 31 1>;
 
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <8 0>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 01000000>;
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
-                       reg = <40000 20100>;
+                       reg = <40000 40000>;
                        built-in;
                        device_type = "open-pic";
                };
 
                [EMAIL PROTECTED] {
-                       linux,phandle = <e0000000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        #interrupt-cells = <2>;
@@ -227,13 +215,12 @@
                        command-proc = <919c0>;
                        brg-frequency = <9d5b340>;
 
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <90c00>;
+                       cpmpic: [EMAIL PROTECTED] {
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
                                interrupts = <1e 0>;
-                               interrupt-parent = <40000>;
+                               interrupt-parent = <&mpic>;
                                reg = <90c00 80>;
                                built-in;
                                device_type = "cpm-pic";
@@ -250,7 +237,7 @@
                                tx-clock = <1>;
                                current-speed = <1c200>;
                                interrupts = <28 8>;
-                               interrupt-parent = <90c00>;
+                               interrupt-parent = <&cpmpic>;
                        };
 
                        [EMAIL PROTECTED] {
@@ -264,7 +251,7 @@
                                tx-clock = <2>;
                                current-speed = <1c200>;
                                interrupts = <29 8>;
-                               interrupt-parent = <90c00>;
+                               interrupt-parent = <&cpmpic>;
                        };
 
                        [EMAIL PROTECTED] {
@@ -278,8 +265,8 @@
                                rx-clock = <15>;
                                tx-clock = <16>;
                                interrupts = <21 8>;
-                               interrupt-parent = <90c00>;
-                               phy-handle = <2452002>;
+                               interrupt-parent = <&cpmpic>;
+                               phy-handle = <&phy2>;
                        };
 
                        [EMAIL PROTECTED] {
@@ -293,8 +280,8 @@
                                rx-clock = <17>;
                                tx-clock = <18>;
                                interrupts = <22 8>;
-                               interrupt-parent = <90c00>;
-                               phy-handle = <2452003>;
+                               interrupt-parent = <&cpmpic>;
+                               phy-handle = <&phy3>;
                        };
                };
        };
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts 
b/arch/powerpc/boot/dts/mpc8568mds.dts
index 06d2465..bf49d8c 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -16,16 +16,14 @@
 
 / {
        model = "MPC8568EMDS";
-       compatible = "MPC85xxMDS";
+       compatible = "MPC8568EMDS", "MPC85xxMDS";
        #address-cells = <1>;
        #size-cells = <1>;
-       linux,phandle = <100>;
 
        cpus {
                #cpus = <1>;
                #address-cells = <1>;
                #size-cells = <0>;
-               linux,phandle = <200>;
 
                PowerPC,[EMAIL PROTECTED] {
                        device_type = "cpu";
@@ -38,13 +36,11 @@
                        bus-frequency = <0>;
                        clock-frequency = <0>;
                        32-bit;
-                       linux,phandle = <201>;
                };
        };
 
        memory {
                device_type = "memory";
-               linux,phandle = <300>;
                reg = <00000000 10000000>;
        };
 
@@ -67,7 +63,7 @@
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -76,7 +72,7 @@
                        compatible = "fsl-i2c";
                        reg = <3100 100>;
                        interrupts = <1b 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
@@ -86,32 +82,26 @@
                        device_type = "mdio";
                        compatible = "gianfar";
                        reg = <24520 20>;
-                       linux,phandle = <24520>;
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452000>;
-                               interrupt-parent = <40000>;
+                       phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <31 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452001>;
-                               interrupt-parent = <40000>;
+                       phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <32 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
-
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452002>;
-                               interrupt-parent = <40000>;
+                       phy2: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <31 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <2452003>;
-                               interrupt-parent = <40000>;
+                       phy3: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <32 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -127,8 +117,8 @@
                        reg = <24000 1000>;
                        mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <d 2 e 2 12 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452002>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy2>;
                };
 
                [EMAIL PROTECTED] {
@@ -140,8 +130,8 @@
                        reg = <25000 1000>;
                        mac-address = [ 00 00 00 00 00 00];
                        interrupts = <13 2 14 2 18 2>;
-                       interrupt-parent = <40000>;
-                       phy-handle = <2452003>;
+                       interrupt-parent = <&mpic>;
+                       phy-handle = <&phy3>;
                };
 
                [EMAIL PROTECTED] {
@@ -150,7 +140,7 @@
                        reg = <4500 100>;
                        clock-frequency = <0>;
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -159,7 +149,7 @@
                        reg = <4600 100>;
                        clock-frequency = <0>;
                        interrupts = <1a 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
                [EMAIL PROTECTED] {
@@ -168,15 +158,14 @@
                        compatible = "talitos";
                        reg = <30000 f000>;
                        interrupts = <1d 2>;
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                        num-channels = <4>;
                        channel-fifo-len = <18>;
                        exec-units-mask = <000000fe>;
                        descriptor-types-mask = <012b0ebf>;
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <40000>;
+               mpic: [EMAIL PROTECTED] {
                        clock-frequency = <0>;
                        interrupt-controller;
                        #address-cells = <0>;
@@ -192,8 +181,7 @@
                        device_type = "par_io";
                        num-ports = <7>;
 
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <e010001>;
+                       pio1: [EMAIL PROTECTED] {
                                pio-map = <
                        /* port  pin  dir  open_drain  assignment  has_irq */
                                        4  0a  1  0  2  0       /* TxD0 */
@@ -220,8 +208,7 @@
                                        4  13  1  0  2  0       /* GTX_CLK */
                                        1  1f  2  0  3  0>;     /* GTX125 */
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <e010002>;
+                       pio2: [EMAIL PROTECTED] {
                                pio-map = <
                        /* port  pin  dir  open_drain  assignment  has_irq */
                                        5  0a 1  0  2  0   /* TxD0 */
@@ -277,7 +264,7 @@
                        compatible = "fsl_spi";
                        reg = <4c0 40>;
                        interrupts = <2>;
-                       interrupt-parent = <80>;
+                       interrupt-parent = <&qeic>;
                        mode = "cpu";
                };
 
@@ -286,7 +273,7 @@
                        compatible = "fsl_spi";
                        reg = <500 40>;
                        interrupts = <1>;
-                       interrupt-parent = <80>;
+                       interrupt-parent = <&qeic>;
                        mode = "cpu";
                };
 
@@ -297,12 +284,12 @@
                        device-id = <1>;
                        reg = <2000 200>;
                        interrupts = <20>;
-                       interrupt-parent = <80>;
+                       interrupt-parent = <&qeic>;
                        mac-address = [ 00 04 9f 00 23 23 ];
                        rx-clock = <0>;
                        tx-clock = <19>;
-                       phy-handle = <212000>;
-                       pio-handle = <e010001>;
+                       phy-handle = <&qe_phy0>;
+                       pio-handle = <&pio1>;
                };
 
                [EMAIL PROTECTED] {
@@ -312,12 +299,12 @@
                        device-id = <2>;
                        reg = <3000 200>;
                        interrupts = <21>;
-                       interrupt-parent = <80>;
+                       interrupt-parent = <&qeic>;
                        mac-address = [ 00 11 22 33 44 55 ];
                        rx-clock = <0>;
                        tx-clock = <14>;
-                       phy-handle = <212001>;
-                       pio-handle = <e010002>;
+                       phy-handle = <&qe_phy1>;
+                       pio-handle = <&pio2>;
                };
 
                [EMAIL PROTECTED] {
@@ -329,33 +316,29 @@
 
                        /* These are the same PHYs as on
                         * gianfar's MDIO bus */
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <212000>;
-                               interrupt-parent = <40000>;
+                       qe_phy0: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <31 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                                interface = <6>; //ENET_1000_GMII
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <212001>;
-                               interrupt-parent = <40000>;
+                       qe_phy1: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <32 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                                interface = <6>;
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <212002>;
-                               interrupt-parent = <40000>;
+                       qe_phy2: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <31 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                                interface = <6>; //ENET_1000_GMII
                        };
-                       [EMAIL PROTECTED] {
-                               linux,phandle = <212003>;
-                               interrupt-parent = <40000>;
+                       qe_phy3: [EMAIL PROTECTED] {
+                               interrupt-parent = <&mpic>;
                                interrupts = <32 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
@@ -363,8 +346,7 @@
                        };
                };
 
-               [EMAIL PROTECTED] {
-                       linux,phandle = <80>;
+               qeic: [EMAIL PROTECTED] {
                        interrupt-controller;
                        device_type = "qeic";
                        #address-cells = <0>;
@@ -373,7 +355,7 @@
                        built-in;
                        big-endian;
                        interrupts = <1e 2 1e 2>; //high:30 low:30
-                       interrupt-parent = <40000>;
+                       interrupt-parent = <&mpic>;
                };
 
        };
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to