[POWERPC] DTS cleanup

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / lite5200b.dts

diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 00211b39a342bd283557baaa336a7ea47966f531..5fe8998abb7c83c51bed7f91e764064cd95ab77f 100644 (file)
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -37,7 +37,6 @@
                        timebase-frequency = <0>;       // from bootloader
                        bus-frequency = <0>;            // from bootloader
                        clock-frequency = <0>;          // from bootloader
-                       32-bit;
                };
        };
 
@@ -50,10 +49,9 @@
                model = "fsl,mpc5200b";
                compatible = "mpc5200";
                revision = "";                  // from bootloader
-               #interrupt-cells = <3>;
                device_type = "soc";
-               ranges = <0 f0000000 f0010000>;
-               reg = <f0000000 00010000>;
+               ranges = <0 f0000000 0000c000>;
+               reg = <f0000000 00000100>;
                bus-frequency = <0>;            // from bootloader
                system-frequency = <0>;         // from bootloader
 
@@ -62,15 +60,13 @@
                        reg = <200 38>;
                };
 
-               pic@500 {
+               mpc5200_pic: pic@500 {
                        // 5200 interrupts are encoded into two levels;
-                       linux,phandle = <500>;
                        interrupt-controller;
                        #interrupt-cells = <3>;
                        device_type = "interrupt-controller";
                        compatible = "mpc5200b-pic\0mpc5200-pic";
                        reg = <500 80>;
-                       built-in;
                };
 
                gpt@600 {       // General Purpose Timer
@@ -79,7 +75,7 @@
                        cell-index = <0>;
                        reg = <600 10>;
                        interrupts = <1 9 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        has-wdt;
                };
 
@@ -89,7 +85,7 @@
                        cell-index = <1>;
                        reg = <610 10>;
                        interrupts = <1 a 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@620 {       // General Purpose Timer
@@ -98,7 +94,7 @@
                        cell-index = <2>;
                        reg = <620 10>;
                        interrupts = <1 b 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@630 {       // General Purpose Timer
@@ -107,7 +103,7 @@
                        cell-index = <3>;
                        reg = <630 10>;
                        interrupts = <1 c 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@640 {       // General Purpose Timer
@@ -116,7 +112,7 @@
                        cell-index = <4>;
                        reg = <640 10>;
                        interrupts = <1 d 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@650 {       // General Purpose Timer
@@ -125,7 +121,7 @@
                        cell-index = <5>;
                        reg = <650 10>;
                        interrupts = <1 e 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@660 {       // General Purpose Timer
@@ -134,7 +130,7 @@
                        cell-index = <6>;
                        reg = <660 10>;
                        interrupts = <1 f 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpt@670 {       // General Purpose Timer
@@ -143,7 +139,7 @@
                        cell-index = <7>;
                        reg = <670 10>;
                        interrupts = <1 10 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                rtc@800 {       // Real time clock
@@ -151,7 +147,7 @@
                        device_type = "rtc";
                        reg = <800 100>;
                        interrupts = <1 5 0 1 6 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                mscan@900 {
@@ -159,7 +155,7 @@
                        compatible = "mpc5200b-mscan\0mpc5200-mscan";
                        cell-index = <0>;
                        interrupts = <2 11 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        reg = <900 80>;
                };
 
@@ -168,7 +164,7 @@
                        compatible = "mpc5200b-mscan\0mpc5200-mscan";
                        cell-index = <1>;
                        interrupts = <2 12 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        reg = <980 80>;
                };
 
@@ -176,14 +172,14 @@
                        compatible = "mpc5200b-gpio\0mpc5200-gpio";
                        reg = <b00 40>;
                        interrupts = <1 7 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                gpio-wkup@c00 {
                        compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup";
                        reg = <c00 40>;
                        interrupts = <1 8 0 0 3 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                pci@0d00 {
@@ -194,18 +190,18 @@
                        compatible = "mpc5200b-pci\0mpc5200-pci";
                        reg = <d00 100>;
                        interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot
-                                        c000 0 0 2 500 1 1 3
-                                        c000 0 0 3 500 1 2 3
-                                        c000 0 0 4 500 1 3 3
-
-                                        c800 0 0 1 500 1 1 3 // 2nd slot
-                                        c800 0 0 2 500 1 2 3
-                                        c800 0 0 3 500 1 3 3
-                                        c800 0 0 4 500 0 0 3>;
+                       interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
+                                        c000 0 0 2 &mpc5200_pic 1 1 3
+                                        c000 0 0 3 &mpc5200_pic 1 2 3
+                                        c000 0 0 4 &mpc5200_pic 1 3 3
+
+                                        c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
+                                        c800 0 0 2 &mpc5200_pic 1 2 3
+                                        c800 0 0 3 &mpc5200_pic 1 3 3
+                                        c800 0 0 4 &mpc5200_pic 0 0 3>;
                        clock-frequency = <0>; // From boot loader
                        interrupts = <2 8 0 2 9 0 2 a 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        bus-range = <0 0>;
                        ranges = <42000000 0 80000000 80000000 0 20000000
                                  02000000 0 a0000000 a0000000 0 10000000
@@ -217,7 +213,7 @@
                        compatible = "mpc5200b-spi\0mpc5200-spi";
                        reg = <f00 20>;
                        interrupts = <2 d 0 2 e 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                usb@1000 {
@@ -225,7 +221,7 @@
                        compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be";
                        reg = <1000 ff>;
                        interrupts = <2 6 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                bestcomm@1200 {
@@ -236,7 +232,7 @@
                                      3 4 0  3 5 0  3 6 0  3 7 0
                                      3 8 0  3 9 0  3 a 0  3 b 0
                                      3 c 0  3 d 0  3 e 0  3 f 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                xlb@1f00 {
@@ -251,7 +247,7 @@
                        cell-index = <0>;
                        reg = <2000 100>;
                        interrupts = <2 1 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                // PSC2 in ac97 mode example
@@ -261,7 +257,7 @@
                //      cell-index = <1>;
                //      reg = <2200 100>;
                //      interrupts = <2 2 0>;
-               //      interrupt-parent = <500>;
+               //      interrupt-parent = <&mpc5200_pic>;
                //};
 
                // PSC3 in CODEC mode example
@@ -271,7 +267,7 @@
                //      cell-index = <2>;
                //      reg = <2400 100>;
                //      interrupts = <2 3 0>;
-               //      interrupt-parent = <500>;
+               //      interrupt-parent = <&mpc5200_pic>;
                //};
 
                // PSC4 in uart mode example
@@ -281,7 +277,7 @@
                //      cell-index = <3>;
                //      reg = <2600 100>;
                //      interrupts = <2 b 0>;
-               //      interrupt-parent = <500>;
+               //      interrupt-parent = <&mpc5200_pic>;
                //};
 
                // PSC5 in uart mode example
@@ -291,7 +287,7 @@
                //      cell-index = <4>;
                //      reg = <2800 100>;
                //      interrupts = <2 c 0>;
-               //      interrupt-parent = <500>;
+               //      interrupt-parent = <&mpc5200_pic>;
                //};
 
                // PSC6 in spi mode example
@@ -301,7 +297,7 @@
                //      cell-index = <5>;
                //      reg = <2c00 100>;
                //      interrupts = <2 4 0>;
-               //      interrupt-parent = <500>;
+               //      interrupt-parent = <&mpc5200_pic>;
                //};
 
                ethernet@3000 {
@@ -310,7 +306,7 @@
                        reg = <3000 800>;
                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
                        interrupts = <2 5 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                ata@3a00 {
@@ -318,7 +314,7 @@
                        compatible = "mpc5200b-ata\0mpc5200-ata";
                        reg = <3a00 100>;
                        interrupts = <2 7 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                };
 
                i2c@3d00 {
@@ -327,7 +323,7 @@
                        cell-index = <0>;
                        reg = <3d00 40>;
                        interrupts = <2 f 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        fsl5200-clocking;
                };
 
@@ -337,7 +333,7 @@
                        cell-index = <1>;
                        reg = <3d40 40>;
                        interrupts = <2 10 0>;
-                       interrupt-parent = <500>;
+                       interrupt-parent = <&mpc5200_pic>;
                        fsl5200-clocking;
                };
                sram@8000 {