]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/powerpc/boot/dts/mpc8560ads.dts
[POWERPC] DTS cleanup
[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8560ads.dts
index 80682152b0cf2314acbff0d8d9a51282a0fd7daa..cf87c30cf6a868a085b96078edaf39484fa777ce 100644 (file)
@@ -30,7 +30,6 @@
                        timebase-frequency = <04ead9a0>;
                        bus-frequency = <13ab6680>;
                        clock-frequency = <312c8040>;
-                       32-bit;
                };
        };
 
@@ -42,7 +41,6 @@
        soc8560@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
                ranges = <0 e0000000 00100000>;
                reg = <e0000000 00000200>;
@@ -52,7 +50,7 @@
                        compatible = "fsl,8540-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <2 2>;
+                       interrupts = <12 2>;
                };
 
                l2-cache-controller@20000 {
@@ -61,7 +59,7 @@
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <40000>;   // L2, 256K
                        interrupt-parent = <&mpic>;
-                       interrupts = <0 2>;
+                       interrupts = <10 2>;
                };
 
                mdio@24520 {
                        #size-cells = <0>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 1>;
+                               interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 1>;
+                               interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <37 1>;
+                               interrupts = <7 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <37 1>;
+                               interrupts = <7 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       address = [ 00 00 0C 00 00 FD ];
-                       interrupts = <d 2 e 2 12 2>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       address = [ 00 00 0C 00 01 FD ];
-                       interrupts = <13 2 14 2 18 2>;
+                       /*
+                        * address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       compatible = "85xx";
+                       compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
                        device_type = "pci";
                        reg = <8000 1000>;
                        clock-frequency = <3f940aa>;
                        interrupt-map = <
 
                                        /* IDSEL 0x2 */
-                                        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
+                                        1000 0 0 1 &mpic 1 1
+                                        1000 0 0 2 &mpic 2 1
+                                        1000 0 0 3 &mpic 3 1
+                                        1000 0 0 4 &mpic 4 1
 
                                        /* IDSEL 0x3 */
-                                        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
+                                        1800 0 0 1 &mpic 4 1
+                                        1800 0 0 2 &mpic 1 1
+                                        1800 0 0 3 &mpic 2 1
+                                        1800 0 0 4 &mpic 3 1
 
                                        /* IDSEL 0x4 */
-                                        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
+                                        2000 0 0 1 &mpic 3 1
+                                        2000 0 0 2 &mpic 4 1
+                                        2000 0 0 3 &mpic 1 1
+                                        2000 0 0 4 &mpic 2 1
 
                                        /* IDSEL 0x5  */
-                                        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
+                                        2800 0 0 1 &mpic 2 1
+                                        2800 0 0 2 &mpic 3 1
+                                        2800 0 0 3 &mpic 4 1
+                                        2800 0 0 4 &mpic 1 1
 
                                        /* IDSEL 12 */
-                                        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
+                                        6000 0 0 1 &mpic 1 1
+                                        6000 0 0 2 &mpic 2 1
+                                        6000 0 0 3 &mpic 3 1
+                                        6000 0 0 4 &mpic 4 1
 
                                        /* IDSEL 13 */
-                                        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
+                                        6800 0 0 1 &mpic 4 1
+                                        6800 0 0 2 &mpic 1 1
+                                        6800 0 0 3 &mpic 2 1
+                                        6800 0 0 4 &mpic 3 1
 
                                        /* IDSEL 14*/
-                                        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
+                                        7000 0 0 1 &mpic 3 1
+                                        7000 0 0 2 &mpic 4 1
+                                        7000 0 0 3 &mpic 1 1
+                                        7000 0 0 4 &mpic 2 1
 
                                        /* IDSEL 15 */
-                                        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
+                                        7800 0 0 1 &mpic 2 1
+                                        7800 0 0 2 &mpic 3 1
+                                        7800 0 0 3 &mpic 4 1
+                                        7800 0 0 4 &mpic 1 1
 
                                        /* IDSEL 18 */
-                                        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
+                                        9000 0 0 1 &mpic 1 1
+                                        9000 0 0 2 &mpic 2 1
+                                        9000 0 0 3 &mpic 3 1
+                                        9000 0 0 4 &mpic 4 1
 
                                        /* IDSEL 19 */
-                                        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
+                                        9800 0 0 1 &mpic 4 1
+                                        9800 0 0 2 &mpic 1 1
+                                        9800 0 0 3 &mpic 2 1
+                                        9800 0 0 4 &mpic 3 1
 
                                        /* IDSEL 20 */
-                                        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
+                                        a000 0 0 1 &mpic 3 1
+                                        a000 0 0 2 &mpic 4 1
+                                        a000 0 0 3 &mpic 1 1
+                                        a000 0 0 4 &mpic 2 1
 
                                        /* IDSEL 21 */
-                                        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>;
+                                        a800 0 0 1 &mpic 2 1
+                                        a800 0 0 2 &mpic 3 1
+                                        a800 0 0 3 &mpic 4 1
+                                        a800 0 0 4 &mpic 1 1>;
 
                        interrupt-parent = <&mpic>;
-                       interrupts = <8 0>;
+                       interrupts = <18 2>;
                        bus-range = <0 0>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 01000000>;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
                        reg = <40000 40000>;
-                       built-in;
                        device_type = "open-pic";
                };
 
                cpm@e0000000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       #interrupt-cells = <2>;
                        device_type = "cpm";
                        model = "CPM2";
                        ranges = <0 0 c0000>;
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
-                               interrupts = <1e 0>;
+                               interrupts = <2e 2>;
                                interrupt-parent = <&mpic>;
                                reg = <90c00 80>;
-                               built-in;
                                device_type = "cpm-pic";
                        };
 
                                model = "FCC";
                                device-id = <2>;
                                reg = <91320 20 88500 100 913a0 30>;
-                               mac-address = [ 00 00 0C 00 02 FD ];
+                               /*
+                                * mac-address is deprecated and will be removed
+                                * in 2.6.25.  Only recent versions of
+                                * U-Boot support local-mac-address, however.
+                                */
+                               mac-address = [ 00 00 00 00 00 00 ];
+                               local-mac-address = [ 00 00 00 00 00 00 ];
                                clock-setup = <ff00ffff 250000>;
                                rx-clock = <15>;
                                tx-clock = <16>;
                                model = "FCC";
                                device-id = <3>;
                                reg = <91340 20 88600 100 913d0 30>;
-                               mac-address = [ 00 00 0C 00 03 FD ];
+                               /*
+                                * mac-address is deprecated and will be removed
+                                * in 2.6.25.  Only recent versions of
+                                * U-Boot support local-mac-address, however.
+                                */
+                               mac-address = [ 00 00 00 00 00 00 ];
+                               local-mac-address = [ 00 00 00 00 00 00 ];
                                clock-setup = <ffff00ff 3700>;
                                rx-clock = <17>;
                                tx-clock = <18>;