]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/powerpc/boot/dts/mpc8548cds.dts
[POWERPC] DTS cleanup
[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc8548cds.dts
index 0550a3c391aa5cb320db13cc2288636623ec10e2..11b823595a08a77eb05c4754d4533b31359f290a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * MPC8555 CDS Device Tree Source
+ * MPC8548 CDS Device Tree Source
  *
  * Copyright 2006 Freescale Semiconductor Inc.
  *
@@ -30,7 +30,6 @@
                        timebase-frequency = <0>;       //  33 MHz, from uboot
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
-                       32-bit;
                };
        };
 
        soc8548@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
-               ranges = <0 e0000000 00100000>;
-               reg = <e0000000 00100000>;      // CCSRBAR 1M
+               ranges = <00001000 e0001000 000ff000
+                         80000000 80000000 10000000
+                         e2000000 e2000000 00800000
+                         90000000 90000000 10000000
+                         e2800000 e2800000 00800000
+                         a0000000 a0000000 20000000
+                         e3000000 e3000000 01000000>;
+               reg = <e0000000 00001000>;      // CCSRBAR
                bus-frequency = <0>;
 
                memory-controller@2000 {
                        compatible = "fsl,8548-memory-controller";
                        reg = <2000 1000>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <2 2>;
+                       interrupts = <12 2>;
                };
 
                l2-cache-controller@20000 {
                        cache-line-size = <20>; // 32 bytes
                        cache-size = <80000>;   // L2, 512K
                        interrupt-parent = <&mpic>;
-                       interrupts = <0 2>;
+                       interrupts = <10 2>;
                };
 
                i2c@3000 {
                        device_type = "i2c";
                        compatible = "fsl-i2c";
                        reg = <3000 100>;
-                       interrupts = <1b 2>;
+                       interrupts = <2b 2>;
                        interrupt-parent = <&mpic>;
                        dfsrr;
                };
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 0>;
+                               interrupts = <5 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 0>;
+                               interrupts = <5 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 0>;
+                               interrupts = <5 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <35 0>;
+                               interrupts = <5 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 00 ];
-                       interrupts = <d 2 e 2 12 2>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
                };
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 01 ];
-                       interrupts = <13 2 14 2 18 2>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
                };
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 02 ];
-                       interrupts = <f 2 10 2 11 2>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <1f 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
                };
                        model = "eTSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                       local-mac-address = [ 00 E0 0C 00 73 03 ];
-                       interrupts = <15 2 16 2 17 2>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <25 2 26 2 27 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
                };
                serial@4500 {
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <4500 100>;       // reg base, size
-                       clock-frequency = <0>;  // should we fill in in uboot?
-                       interrupts = <1a 2>;
+                       reg = <4500 100>;       // reg base, size
+                       clock-frequency = <0>;  // should we fill in in uboot?
+                       interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
 
                        device_type = "serial";
                        compatible = "ns16550";
                        reg = <4600 100>;       // reg base, size
-                       clock-frequency = <0>;  // should we fill in in uboot?
-                       interrupts = <1a 2>;
+                       clock-frequency = <0>;  // should we fill in in uboot?
+                       interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
 
                        fsl,has-rstcr;
                };
 
-               pci1: pci@8000 {
-                       interrupt-map-mask = <1f800 0 0 7>;
+               pci@8000 {
+                       interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
+                               /* IDSEL 0x4 (PCIX Slot 2) */
+                               02000 0 0 1 &mpic 0 1
+                               02000 0 0 2 &mpic 1 1
+                               02000 0 0 3 &mpic 2 1
+                               02000 0 0 4 &mpic 3 1
+
+                               /* IDSEL 0x5 (PCIX Slot 3) */
+                               02800 0 0 1 &mpic 1 1
+                               02800 0 0 2 &mpic 2 1
+                               02800 0 0 3 &mpic 3 1
+                               02800 0 0 4 &mpic 0 1
+
+                               /* IDSEL 0x6 (PCIX Slot 4) */
+                               03000 0 0 1 &mpic 2 1
+                               03000 0 0 2 &mpic 3 1
+                               03000 0 0 3 &mpic 0 1
+                               03000 0 0 4 &mpic 1 1
+
+                               /* IDSEL 0x8 (PCIX Slot 5) */
+                               04000 0 0 1 &mpic 0 1
+                               04000 0 0 2 &mpic 1 1
+                               04000 0 0 3 &mpic 2 1
+                               04000 0 0 4 &mpic 3 1
+
+                               /* IDSEL 0xC (Tsi310 bridge) */
+                               06000 0 0 1 &mpic 0 1
+                               06000 0 0 2 &mpic 1 1
+                               06000 0 0 3 &mpic 2 1
+                               06000 0 0 4 &mpic 3 1
+
+                               /* IDSEL 0x14 (Slot 2) */
+                               0a000 0 0 1 &mpic 0 1
+                               0a000 0 0 2 &mpic 1 1
+                               0a000 0 0 3 &mpic 2 1
+                               0a000 0 0 4 &mpic 3 1
+
+                               /* IDSEL 0x15 (Slot 3) */
+                               0a800 0 0 1 &mpic 1 1
+                               0a800 0 0 2 &mpic 2 1
+                               0a800 0 0 3 &mpic 3 1
+                               0a800 0 0 4 &mpic 0 1
+
+                               /* IDSEL 0x16 (Slot 4) */
+                               0b000 0 0 1 &mpic 2 1
+                               0b000 0 0 2 &mpic 3 1
+                               0b000 0 0 3 &mpic 0 1
+                               0b000 0 0 4 &mpic 1 1
+
+                               /* IDSEL 0x18 (Slot 5) */
+                               0c000 0 0 1 &mpic 0 1
+                               0c000 0 0 2 &mpic 1 1
+                               0c000 0 0 3 &mpic 2 1
+                               0c000 0 0 4 &mpic 3 1
+
+                               /* IDSEL 0x1C (Tsi310 bridge PCI primary) */
+                               0E000 0 0 1 &mpic 0 1
+                               0E000 0 0 2 &mpic 1 1
+                               0E000 0 0 3 &mpic 2 1
+                               0E000 0 0 4 &mpic 3 1>;
 
-                               /* IDSEL 0x10 */
-                               08000 0 0 1 &mpic 30 1
-                               08000 0 0 2 &mpic 31 1
-                               08000 0 0 3 &mpic 32 1
-                               08000 0 0 4 &mpic 33 1
-
-                               /* IDSEL 0x11 */
-                               08800 0 0 1 &mpic 30 1
-                               08800 0 0 2 &mpic 31 1
-                               08800 0 0 3 &mpic 32 1
-                               08800 0 0 4 &mpic 33 1
-
-                               /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 &mpic 30 1
-                               09000 0 0 2 &mpic 31 1
-                               09000 0 0 3 &mpic 32 1
-                               09000 0 0 4 &mpic 33 1
-
-                               /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 &mpic 31 1
-                               09800 0 0 2 &mpic 32 1
-                               09800 0 0 3 &mpic 33 1
-                               09800 0 0 4 &mpic 30 1
-
-                               /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 &mpic 32 1
-                               0a000 0 0 2 &mpic 33 1
-                               0a000 0 0 3 &mpic 30 1
-                               0a000 0 0 4 &mpic 31 1
-
-                               /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 &mpic 33 1
-                               0a800 0 0 2 &mpic 30 1
-                               0a800 0 0 3 &mpic 31 1
-                               0a800 0 0 4 &mpic 32 1
-
-                               /* Bus 1 (Tundra Bridge) */
-                               /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 &mpic 30 1
-                               19000 0 0 2 &mpic 31 1
-                               19000 0 0 3 &mpic 32 1
-                               19000 0 0 4 &mpic 33 1>;
                        interrupt-parent = <&mpic>;
-                       interrupts = <08 2>;
+                       interrupts = <18 2>;
                        bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
+                       ranges = <02000000 0 80000000 80000000 0 10000000
+                                 01000000 0 00000000 e2000000 0 00800000>;
                        clock-frequency = <3f940aa>;
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
                        reg = <8000 1000>;
-                       compatible = "85xx";
+                       compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
                        device_type = "pci";
 
-                       i8259@19000 {
-                               clock-frequency = <0>;
-                               interrupt-controller;
-                               device_type = "interrupt-controller";
-                               reg = <19000 0 0 0 1>;
-                               #address-cells = <0>;
-                               #interrupt-cells = <2>;
-                               built-in;
-                               compatible = "chrp,iic";
-                               big-endian;
-                               interrupts = <1>;
-                               interrupt-parent = <&pci1>;
+                       pci_bridge@1c {
+                               interrupt-map-mask = <f800 0 0 7>;
+                               interrupt-map = <
+
+                                       /* IDSEL 0x00 (PrPMC Site) */
+                                       0000 0 0 1 &mpic 0 1
+                                       0000 0 0 2 &mpic 1 1
+                                       0000 0 0 3 &mpic 2 1
+                                       0000 0 0 4 &mpic 3 1
+
+                                       /* IDSEL 0x04 (VIA chip) */
+                                       2000 0 0 1 &mpic 0 1
+                                       2000 0 0 2 &mpic 1 1
+                                       2000 0 0 3 &mpic 2 1
+                                       2000 0 0 4 &mpic 3 1
+
+                                       /* IDSEL 0x05 (8139) */
+                                       2800 0 0 1 &mpic 1 1
+
+                                       /* IDSEL 0x06 (Slot 6) */
+                                       3000 0 0 1 &mpic 2 1
+                                       3000 0 0 2 &mpic 3 1
+                                       3000 0 0 3 &mpic 0 1
+                                       3000 0 0 4 &mpic 1 1
+
+                                       /* IDESL 0x07 (Slot 7) */
+                                       3800 0 0 1 &mpic 3 1
+                                       3800 0 0 2 &mpic 0 1
+                                       3800 0 0 3 &mpic 1 1
+                                       3800 0 0 4 &mpic 2 1>;
+
+                               reg = <e000 0 0 0 0>;
+                               #interrupt-cells = <1>;
+                               #size-cells = <2>;
+                               #address-cells = <3>;
+                               ranges = <02000000 0 80000000
+                                         02000000 0 80000000
+                                         0 20000000
+                                         01000000 0 00000000
+                                         01000000 0 00000000
+                                         0 00080000>;
+                               clock-frequency = <1fca055>;
+
+                               isa@4 {
+                                       device_type = "isa";
+                                       #interrupt-cells = <2>;
+                                       #size-cells = <1>;
+                                       #address-cells = <2>;
+                                       reg = <2000 0 0 0 0>;
+                                       ranges = <1 0 01000000 0 0 00001000>;
+                                       interrupt-parent = <&i8259>;
+
+                                       i8259: interrupt-controller@20 {
+                                               interrupt-controller;
+                                               device_type = "interrupt-controller";
+                                               reg = <1 20 2
+                                                      1 a0 2
+                                                      1 4d0 2>;
+                                               #address-cells = <0>;
+                                               #interrupt-cells = <2>;
+                                               compatible = "chrp,iic";
+                                               interrupts = <0 1>;
+                                               interrupt-parent = <&mpic>;
+                                       };
+
+                                       rtc@70 {
+                                               compatible = "pnpPNP,b00";
+                                               reg = <1 70 2>;
+                                       };
+                               };
                        };
                };
 
                        interrupt-map = <
 
                                /* IDSEL 0x15 */
-                               a800 0 0 1 &mpic 3b 1
-                               a800 0 0 2 &mpic 3b 1
-                               a800 0 0 3 &mpic 3b 1
-                               a800 0 0 4 &mpic 3b 1>;
+                               a800 0 0 1 &mpic b 1
+                               a800 0 0 2 &mpic 1 1
+                               a800 0 0 3 &mpic 2 1
+                               a800 0 0 4 &mpic 3 1>;
+
                        interrupt-parent = <&mpic>;
-                       interrupts = <09 2>;
+                       interrupts = <19 2>;
                        bus-range = <0 0>;
-                       ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                 01000000 0 00000000 e3000000 0 00100000>;
+                       ranges = <02000000 0 90000000 90000000 0 10000000
+                                 01000000 0 00000000 e2800000 0 00800000>;
                        clock-frequency = <3f940aa>;
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
                        reg = <9000 1000>;
-                       compatible = "85xx";
+                       compatible = "fsl,mpc8540-pci";
+                       device_type = "pci";
+               };
+               /* PCI Express */
+               pcie@a000 {
+                       interrupt-map-mask = <f800 0 0 7>;
+                       interrupt-map = <
+
+                               /* IDSEL 0x0 (PEX) */
+                               00000 0 0 1 &mpic 0 1
+                               00000 0 0 2 &mpic 1 1
+                               00000 0 0 3 &mpic 2 1
+                               00000 0 0 4 &mpic 3 1>;
+
+                       interrupt-parent = <&mpic>;
+                       interrupts = <1a 2>;
+                       bus-range = <0 ff>;
+                       ranges = <02000000 0 a0000000 a0000000 0 20000000
+                                 01000000 0 00000000 e3000000 0 08000000>;
+                       clock-frequency = <1fca055>;
+                       #interrupt-cells = <1>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       reg = <a000 1000>;
+                       compatible = "fsl,mpc8548-pcie";
                        device_type = "pci";
                };
 
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
                        reg = <40000 40000>;
-                       built-in;
                        compatible = "chrp,open-pic";
                        device_type = "open-pic";
                         big-endian;