1 files changed, 18 insertions, 21 deletions

diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 3190774de1d8..b2e1a5ec3779 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -10,7 +10,7 @@
  */
 / {
         model = "MPC8349EMITXGP";
-        compatible = "MPC834xMITXGP";
+        compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -58,7 +58,7 @@
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <e 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                         dfsrr;
                 };
 
@@ -67,7 +67,7 @@
                         compatible = "fsl-i2c";
                         reg = <3100 100>;
                         interrupts = <f 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                         dfsrr;
                 };
 
@@ -76,7 +76,7 @@
                         compatible = "mpc83xx_spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                         mode = <0>;
                 };
 
@@ -86,8 +86,8 @@
                         reg = <23000 1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = <700>;
-                        interrupts = <26 2>;
+                        interrupt-parent = < &ipic >;
+                        interrupts = <26 8>;
                         dr_mode = "otg";
                         phy_type = "ulpi";
                 };
@@ -98,13 +98,11 @@
                         reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        linux,phandle = <24520>;
 
                         /* Vitesse 8201 */
-                        ethernet-phy@1c {
-                                linux,phandle = <245201c>;
-                                interrupt-parent = <700>;
-                                interrupts = <12 2>;
+                        phy1c: ethernet-phy@1c {
+                                interrupt-parent = < &ipic >;
+                                interrupts = <12 8>;
                                 reg = <1c>;
                                 device_type = "ethernet-phy";
                         };
@@ -117,8 +115,8 @@
                         reg = <24000 1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <20 8 21 8 22 8>;
-                        interrupt-parent = <700>;
-                        phy-handle = <245201c>;
+                        interrupt-parent = < &ipic >;
+                        phy-handle = < &phy1c >;
                 };
 
                 serial@4500 {
@@ -127,7 +125,7 @@
                         reg = <4500 100>;
                         clock-frequency = <0>;          // from bootloader
                         interrupts = <9 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                 };
 
                 serial@4600 {
@@ -136,17 +134,17 @@
                         reg = <4600 100>;
                         clock-frequency = <0>;          // from bootloader
                         interrupts = <a 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                 };
 
                 pci@8600 {
                         interrupt-map-mask = <f800 0 0 7>;
                         interrupt-map = <
                                         /* IDSEL 0x0F - PCI Slot */
-                                        7800 0 0 1 700 14 8 /* PCI_INTA */
-                                        7800 0 0 2 700 15 8 /* PCI_INTB */
+                                        7800 0 0 1 &ipic 14 8 /* PCI_INTA */
+                                        7800 0 0 2 &ipic 15 8 /* PCI_INTB */
                                          >;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                         interrupts = <43 8>;
                         bus-range = <1 1>;
                         ranges = <42000000 0 a0000000 a0000000 0 10000000
@@ -167,15 +165,14 @@
                         compatible = "talitos";
                         reg = <30000 10000>;
                         interrupts = <b 8>;
-                        interrupt-parent = <700>;
+                        interrupt-parent = < &ipic >;
                         num-channels = <4>;
                         channel-fifo-len = <18>;
                         exec-units-mask = <0000007e>;
                         descriptor-types-mask = <01010ebf>;
                 };
 
-                pic@700 {
-                        linux,phandle = <700>;
+                ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;