]> err.no Git - linux-2.6/commitdiff
powerpc/85xx: Fix KSI8560 .dts
authorKumar Gala <galak@kernel.crashing.org>
Tue, 1 Jul 2008 04:24:14 +0000 (23:24 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Mon, 14 Jul 2008 12:55:29 +0000 (07:55 -0500)
Rename MPIC label to mpic to match all other 85xx .dts and to fix compile
issue introduced by addition of the DMA node.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
arch/powerpc/boot/dts/ksi8560.dts

index fd5804398417ce8ac25681c801af7c2351f80708..49737589ffc81f65778a2dbf4a8476427ab49e09 100644 (file)
@@ -59,7 +59,7 @@
                memory-controller@2000 {
                        compatible = "fsl,8540-memory-controller";
                        reg = <0x2000 0x1000>;
-                       interrupt-parent = <&MPIC>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <0x12 0x2>;
                };
 
@@ -68,7 +68,7 @@
                        reg = <0x20000 0x1000>;
                        cache-line-size = <0x20>;               /* 32 bytes */
                        cache-size = <0x40000>;                 /* L2, 256K */
-                       interrupt-parent = <&MPIC>;
+                       interrupt-parent = <&mpic>;
                        interrupts = <0x10 0x2>;
                };
 
@@ -79,7 +79,7 @@
                        compatible = "fsl-i2c";
                        reg = <0x3000 0x100>;
                        interrupts = <0x2b 0x2>;
-                       interrupt-parent = <&MPIC>;
+                       interrupt-parent = <&mpic>;
                        dfsrr;
                };
 
                        reg = <0x24520 0x20>;
 
                        PHY1: ethernet-phy@1 {
-                               interrupt-parent = <&MPIC>;
+                               interrupt-parent = <&mpic>;
                                reg = <0x1>;
                                device_type = "ethernet-phy";
                        };
 
                        PHY2: ethernet-phy@2 {
-                               interrupt-parent = <&MPIC>;
+                               interrupt-parent = <&mpic>;
                                reg = <0x2>;
                                device_type = "ethernet-phy";
                        };
                        /* Mac address filled in by bootwrapper */
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-                       interrupt-parent = <&MPIC>;
+                       interrupt-parent = <&mpic>;
                        phy-handle = <&PHY1>;
                };
 
                        /* Mac address filled in by bootwrapper */
                        local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-                       interrupt-parent = <&MPIC>;
+                       interrupt-parent = <&mpic>;
                        phy-handle = <&PHY2>;
                };
 
-               MPIC: pic@40000 {
+               mpic: pic@40000 {
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
                        interrupt-controller;
                                #interrupt-cells = <2>;
                                interrupt-controller;
                                interrupts = <0x2e 0x2>;
-                               interrupt-parent = <&MPIC>;
+                               interrupt-parent = <&mpic>;
                                reg = <0x90c00 0x80>;
                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
                        };
                                fsl,mdc-pin = <25>;
 
                                PHY0: ethernet-phy@0 {
-                                       interrupt-parent = <&MPIC>;
+                                       interrupt-parent = <&mpic>;
                                        reg = <0x0>;
                                        device_type = "ethernet-phy";
                                };