]> err.no Git - linux-2.6/blobdiff - arch/powerpc/boot/dts/mpc8560ads.dts
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[linux-2.6] / arch / powerpc / boot / dts / mpc8560ads.dts
index 16dbe848cecf26db2d1b055cc5a92c1333f05ba0..0cc16ab305d118879ad59dba5a144bc21a6af1c6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * MPC8560 ADS Device Tree Source
  *
- * Copyright 2006 Freescale Semiconductor Inc.
+ * Copyright 2006, 2008 Freescale Semiconductor Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -9,6 +9,7 @@
  * option) any later version.
  */
 
+/dts-v1/;
 
 / {
        model = "MPC8560ADS";
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               ethernet0 = &enet0;
+               ethernet1 = &enet1;
+               ethernet2 = &enet2;
+               ethernet3 = &enet3;
+               serial0 = &serial0;
+               serial1 = &serial1;
+               pci0 = &pci0;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
                PowerPC,8560@0 {
                        device_type = "cpu";
-                       reg = <0>;
-                       d-cache-line-size = <20>;       // 32 bytes
-                       i-cache-line-size = <20>;       // 32 bytes
-                       d-cache-size = <8000>;          // L1, 32K
-                       i-cache-size = <8000>;          // L1, 32K
-                       timebase-frequency = <04ead9a0>;
-                       bus-frequency = <13ab6680>;
-                       clock-frequency = <312c8040>;
-                       32-bit;
+                       reg = <0x0>;
+                       d-cache-line-size = <32>;       // 32 bytes
+                       i-cache-line-size = <32>;       // 32 bytes
+                       d-cache-size = <0x8000>;                // L1, 32K
+                       i-cache-size = <0x8000>;                // L1, 32K
+                       timebase-frequency = <82500000>;
+                       bus-frequency = <330000000>;
+                       clock-frequency = <825000000>;
                };
        };
 
        memory {
                device_type = "memory";
-               reg = <00000000 10000000>;
+               reg = <0x0 0x10000000>;
        };
 
        soc8560@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
-               ranges = <0 e0000000 00100000>;
-               reg = <e0000000 00000200>;
-               bus-frequency = <13ab6680>;
+               ranges = <0x0 0xe0000000 0x100000>;
+               reg = <0xe0000000 0x200>;
+               bus-frequency = <330000000>;
 
                memory-controller@2000 {
                        compatible = "fsl,8540-memory-controller";
-                       reg = <2000 1000>;
+                       reg = <0x2000 0x1000>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <12 2>;
+                       interrupts = <18 2>;
                };
 
                l2-cache-controller@20000 {
                        compatible = "fsl,8540-l2-cache-controller";
-                       reg = <20000 1000>;
-                       cache-line-size = <20>; // 32 bytes
-                       cache-size = <40000>;   // L2, 256K
+                       reg = <0x20000 0x1000>;
+                       cache-line-size = <32>; // 32 bytes
+                       cache-size = <0x40000>; // L2, 256K
                        interrupt-parent = <&mpic>;
-                       interrupts = <10 2>;
+                       interrupts = <16 2>;
                };
 
                mdio@24520 {
-                       device_type = "mdio";
-                       compatible = "gianfar";
-                       reg = <24520 20>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       compatible = "fsl,gianfar-mdio";
+                       reg = <0x24520 0x20>;
+
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
                                interrupts = <5 1>;
-                               reg = <0>;
+                               reg = <0x0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
                                interrupts = <5 1>;
-                               reg = <1>;
+                               reg = <0x1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
                                interrupts = <7 1>;
-                               reg = <2>;
+                               reg = <0x2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
                                interrupts = <7 1>;
-                               reg = <3>;
+                               reg = <0x3>;
                                device_type = "ethernet-phy";
                        };
                };
 
-               ethernet@24000 {
+               enet0: ethernet@24000 {
+                       cell-index = <0>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
-                       reg = <24000 1000>;
-                       /*
-                        * 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 ];
+                       reg = <0x24000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <1d 2 1e 2 22 2>;
+                       interrupts = <29 2 30 2 34 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
 
-               ethernet@25000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               enet1: ethernet@25000 {
+                       cell-index = <1>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
-                       reg = <25000 1000>;
-                       /*
-                        * 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 ];
+                       reg = <0x25000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <23 2 24 2 28 2>;
+                       interrupts = <35 2 36 2 40 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
 
-               pci@8000 {
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                       device_type = "pci";
-                       reg = <8000 1000>;
-                       clock-frequency = <3f940aa>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x2 */
-                                        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 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 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 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 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 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 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 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 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 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 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 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 = <18 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e2000000 0 01000000>;
-               };
-
                mpic: pic@40000 {
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
-                       reg = <40000 40000>;
-                       built-in;
+                       reg = <0x40000 0x40000>;
                        device_type = "open-pic";
                };
 
-               cpm@e0000000 {
+               cpm@919c0 {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       #interrupt-cells = <2>;
-                       device_type = "cpm";
-                       model = "CPM2";
-                       ranges = <0 0 c0000>;
-                       reg = <80000 40000>;
-                       command-proc = <919c0>;
-                       brg-frequency = <9d5b340>;
+                       compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
+                       reg = <0x919c0 0x30>;
+                       ranges;
+
+                       muram@80000 {
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x0 0x80000 0x10000>;
+
+                               data@0 {
+                                       compatible = "fsl,cpm-muram-data";
+                                       reg = <0x0 0x4000 0x9000 0x2000>;
+                               };
+                       };
+
+                       brg@919f0 {
+                               compatible = "fsl,mpc8560-brg",
+                                            "fsl,cpm2-brg",
+                                            "fsl,cpm-brg";
+                               reg = <0x919f0 0x10 0x915f0 0x10>;
+                               clock-frequency = <165000000>;
+                       };
 
                        cpmpic: pic@90c00 {
                                interrupt-controller;
                                #address-cells = <0>;
                                #interrupt-cells = <2>;
-                               interrupts = <2e 2>;
+                               interrupts = <46 2>;
                                interrupt-parent = <&mpic>;
-                               reg = <90c00 80>;
-                               built-in;
-                               device_type = "cpm-pic";
+                               reg = <0x90c00 0x80>;
+                               compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
                        };
 
-                       scc@91a00 {
+                       serial0: serial@91a00 {
                                device_type = "serial";
-                               compatible = "cpm_uart";
-                               model = "SCC";
-                               device-id = <1>;
-                               reg = <91a00 20 88000 100>;
-                               clock-setup = <00ffffff 0>;
-                               rx-clock = <1>;
-                               tx-clock = <1>;
-                               current-speed = <1c200>;
-                               interrupts = <28 8>;
+                               compatible = "fsl,mpc8560-scc-uart",
+                                            "fsl,cpm2-scc-uart";
+                               reg = <0x91a00 0x20 0x88000 0x100>;
+                               fsl,cpm-brg = <1>;
+                               fsl,cpm-command = <0x800000>;
+                               current-speed = <115200>;
+                               interrupts = <40 8>;
                                interrupt-parent = <&cpmpic>;
                        };
 
-                       scc@91a20 {
+                       serial1: serial@91a20 {
                                device_type = "serial";
-                               compatible = "cpm_uart";
-                               model = "SCC";
-                               device-id = <2>;
-                               reg = <91a20 20 88100 100>;
-                               clock-setup = <ff00ffff 90000>;
-                               rx-clock = <2>;
-                               tx-clock = <2>;
-                               current-speed = <1c200>;
-                               interrupts = <29 8>;
+                               compatible = "fsl,mpc8560-scc-uart",
+                                            "fsl,cpm2-scc-uart";
+                               reg = <0x91a20 0x20 0x88100 0x100>;
+                               fsl,cpm-brg = <2>;
+                               fsl,cpm-command = <0x4a00000>;
+                               current-speed = <115200>;
+                               interrupts = <41 8>;
                                interrupt-parent = <&cpmpic>;
                        };
 
-                       fcc@91320 {
+                       enet2: ethernet@91320 {
                                device_type = "network";
-                               compatible = "fs_enet";
-                               model = "FCC";
-                               device-id = <2>;
-                               reg = <91320 20 88500 100 913a0 30>;
-                               /*
-                                * 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 ];
+                               compatible = "fsl,mpc8560-fcc-enet",
+                                            "fsl,cpm2-fcc-enet";
+                               reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
                                local-mac-address = [ 00 00 00 00 00 00 ];
-                               clock-setup = <ff00ffff 250000>;
-                               rx-clock = <15>;
-                               tx-clock = <16>;
-                               interrupts = <21 8>;
+                               fsl,cpm-command = <0x16200300>;
+                               interrupts = <33 8>;
                                interrupt-parent = <&cpmpic>;
                                phy-handle = <&phy2>;
                        };
 
-                       fcc@91340 {
+                       enet3: ethernet@91340 {
                                device_type = "network";
-                               compatible = "fs_enet";
-                               model = "FCC";
-                               device-id = <3>;
-                               reg = <91340 20 88600 100 913d0 30>;
-                               /*
-                                * 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 ];
+                               compatible = "fsl,mpc8560-fcc-enet",
+                                            "fsl,cpm2-fcc-enet";
+                               reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
                                local-mac-address = [ 00 00 00 00 00 00 ];
-                               clock-setup = <ffff00ff 3700>;
-                               rx-clock = <17>;
-                               tx-clock = <18>;
-                               interrupts = <22 8>;
+                               fsl,cpm-command = <0x1a400300>;
+                               interrupts = <34 8>;
                                interrupt-parent = <&cpmpic>;
                                phy-handle = <&phy3>;
                        };
                };
        };
+
+       pci0: pci@e0008000 {
+               cell-index = <0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+               device_type = "pci";
+               reg = <0xe0008000 0x1000>;
+               clock-frequency = <66666666>;
+               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+               interrupt-map = <
+
+                               /* IDSEL 0x2 */
+                                0x1000 0x0 0x0 0x1 &mpic 0x1 0x1
+                                0x1000 0x0 0x0 0x2 &mpic 0x2 0x1
+                                0x1000 0x0 0x0 0x3 &mpic 0x3 0x1
+                                0x1000 0x0 0x0 0x4 &mpic 0x4 0x1
+
+                               /* IDSEL 0x3 */
+                                0x1800 0x0 0x0 0x1 &mpic 0x4 0x1
+                                0x1800 0x0 0x0 0x2 &mpic 0x1 0x1
+                                0x1800 0x0 0x0 0x3 &mpic 0x2 0x1
+                                0x1800 0x0 0x0 0x4 &mpic 0x3 0x1
+
+                               /* IDSEL 0x4 */
+                                0x2000 0x0 0x0 0x1 &mpic 0x3 0x1
+                                0x2000 0x0 0x0 0x2 &mpic 0x4 0x1
+                                0x2000 0x0 0x0 0x3 &mpic 0x1 0x1
+                                0x2000 0x0 0x0 0x4 &mpic 0x2 0x1
+
+                               /* IDSEL 0x5  */
+                                0x2800 0x0 0x0 0x1 &mpic 0x2 0x1
+                                0x2800 0x0 0x0 0x2 &mpic 0x3 0x1
+                                0x2800 0x0 0x0 0x3 &mpic 0x4 0x1
+                                0x2800 0x0 0x0 0x4 &mpic 0x1 0x1
+
+                               /* IDSEL 12 */
+                                0x6000 0x0 0x0 0x1 &mpic 0x1 0x1
+                                0x6000 0x0 0x0 0x2 &mpic 0x2 0x1
+                                0x6000 0x0 0x0 0x3 &mpic 0x3 0x1
+                                0x6000 0x0 0x0 0x4 &mpic 0x4 0x1
+
+                               /* IDSEL 13 */
+                                0x6800 0x0 0x0 0x1 &mpic 0x4 0x1
+                                0x6800 0x0 0x0 0x2 &mpic 0x1 0x1
+                                0x6800 0x0 0x0 0x3 &mpic 0x2 0x1
+                                0x6800 0x0 0x0 0x4 &mpic 0x3 0x1
+
+                               /* IDSEL 14*/
+                                0x7000 0x0 0x0 0x1 &mpic 0x3 0x1
+                                0x7000 0x0 0x0 0x2 &mpic 0x4 0x1
+                                0x7000 0x0 0x0 0x3 &mpic 0x1 0x1
+                                0x7000 0x0 0x0 0x4 &mpic 0x2 0x1
+
+                               /* IDSEL 15 */
+                                0x7800 0x0 0x0 0x1 &mpic 0x2 0x1
+                                0x7800 0x0 0x0 0x2 &mpic 0x3 0x1
+                                0x7800 0x0 0x0 0x3 &mpic 0x4 0x1
+                                0x7800 0x0 0x0 0x4 &mpic 0x1 0x1
+
+                               /* IDSEL 18 */
+                                0x9000 0x0 0x0 0x1 &mpic 0x1 0x1
+                                0x9000 0x0 0x0 0x2 &mpic 0x2 0x1
+                                0x9000 0x0 0x0 0x3 &mpic 0x3 0x1
+                                0x9000 0x0 0x0 0x4 &mpic 0x4 0x1
+
+                               /* IDSEL 19 */
+                                0x9800 0x0 0x0 0x1 &mpic 0x4 0x1
+                                0x9800 0x0 0x0 0x2 &mpic 0x1 0x1
+                                0x9800 0x0 0x0 0x3 &mpic 0x2 0x1
+                                0x9800 0x0 0x0 0x4 &mpic 0x3 0x1
+
+                               /* IDSEL 20 */
+                                0xa000 0x0 0x0 0x1 &mpic 0x3 0x1
+                                0xa000 0x0 0x0 0x2 &mpic 0x4 0x1
+                                0xa000 0x0 0x0 0x3 &mpic 0x1 0x1
+                                0xa000 0x0 0x0 0x4 &mpic 0x2 0x1
+
+                               /* IDSEL 21 */
+                                0xa800 0x0 0x0 0x1 &mpic 0x2 0x1
+                                0xa800 0x0 0x0 0x2 &mpic 0x3 0x1
+                                0xa800 0x0 0x0 0x3 &mpic 0x4 0x1
+                                0xa800 0x0 0x0 0x4 &mpic 0x1 0x1>;
+
+               interrupt-parent = <&mpic>;
+               interrupts = <24 2>;
+               bus-range = <0 0>;
+               ranges = <0x2000000 0x0 0x80000000 0x80000000 0x0 0x20000000
+                         0x1000000 0x0 0x0 0xe2000000 0x0 0x1000000>;
+       };
 };