]> err.no Git - linux-2.6/commitdiff
[POWERPC] Move PCI nodes to be sibilings with SOC nodes
authorKumar Gala <galak@kernel.crashing.org>
Wed, 12 Sep 2007 23:23:46 +0000 (18:23 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Fri, 14 Sep 2007 13:53:22 +0000 (08:53 -0500)
Updated the device trees to have the PCI nodes be at the same level as
the SOC node.  This is to make it so that the SOC nodes children address
space is just on chip registers and not other bus memory as well.

Also, for PCIe nodes added a P2P bridge to handle the virtual P2P bridge
that exists in the PHB.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
16 files changed:
arch/powerpc/boot/dts/lite5200.dts
arch/powerpc/boot/dts/lite5200b.dts
arch/powerpc/boot/dts/mpc8313erdb.dts
arch/powerpc/boot/dts/mpc832x_mds.dts
arch/powerpc/boot/dts/mpc832x_rdb.dts
arch/powerpc/boot/dts/mpc8349emitx.dts
arch/powerpc/boot/dts/mpc8349emitxgp.dts
arch/powerpc/boot/dts/mpc834x_mds.dts
arch/powerpc/boot/dts/mpc836x_mds.dts
arch/powerpc/boot/dts/mpc8540ads.dts
arch/powerpc/boot/dts/mpc8541cds.dts
arch/powerpc/boot/dts/mpc8544ds.dts
arch/powerpc/boot/dts/mpc8548cds.dts
arch/powerpc/boot/dts/mpc8555cds.dts
arch/powerpc/boot/dts/mpc8560ads.dts
arch/powerpc/boot/dts/mpc8641_hpcn.dts

index d8bcbb870fdc9316cb9c9e56d0259fa7b258264c..324e1bd2aa609bb50fa37222bd9a4a9171e75e68 100644 (file)
                        interrupt-parent = <&mpc5200_pic>;
                };
 
-               pci@0d00 {
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
-                       compatible = "mpc5200-pci";
-                       reg = <d00 100>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
-                                        c000 0 0 2 &mpc5200_pic 0 0 3
-                                        c000 0 0 3 &mpc5200_pic 0 0 3
-                                        c000 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 = <&mpc5200_pic>;
-                       bus-range = <0 0>;
-                       ranges = <42000000 0 80000000 80000000 0 20000000
-                                 02000000 0 a0000000 a0000000 0 10000000
-                                 01000000 0 00000000 b0000000 0 01000000>;
-               };
-
                spi@f00 {
                        device_type = "spi";
                        compatible = "mpc5200-spi";
                        reg = <8000 4000>;
                };
        };
+
+       pci@f0000d00 {
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               device_type = "pci";
+               compatible = "mpc5200-pci";
+               reg = <f0000d00 100>;
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
+                                c000 0 0 2 &mpc5200_pic 0 0 3
+                                c000 0 0 3 &mpc5200_pic 0 0 3
+                                c000 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 = <&mpc5200_pic>;
+               bus-range = <0 0>;
+               ranges = <42000000 0 80000000 80000000 0 20000000
+                         02000000 0 a0000000 a0000000 0 10000000
+                         01000000 0 00000000 b0000000 0 01000000>;
+       };
 };
index 5fe8998abb7c83c51bed7f91e764064cd95ab77f..3f74f73f70adcf199c0b41ac7d975d66e0c5166f 100644 (file)
                        interrupt-parent = <&mpc5200_pic>;
                };
 
-               pci@0d00 {
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
-                       compatible = "mpc5200b-pci\0mpc5200-pci";
-                       reg = <d00 100>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       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 = <&mpc5200_pic>;
-                       bus-range = <0 0>;
-                       ranges = <42000000 0 80000000 80000000 0 20000000
-                                 02000000 0 a0000000 a0000000 0 10000000
-                                 01000000 0 00000000 b0000000 0 01000000>;
-               };
-
                spi@f00 {
                        device_type = "spi";
                        compatible = "mpc5200b-spi\0mpc5200-spi";
                        reg = <8000 4000>;
                };
        };
+
+       pci@f0000d00 {
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               device_type = "pci";
+               compatible = "mpc5200b-pci\0mpc5200-pci";
+               reg = <f0000d00 100>;
+               interrupt-map-mask = <f800 0 0 7>;
+               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 = <&mpc5200_pic>;
+               bus-range = <0 0>;
+               ranges = <42000000 0 80000000 80000000 0 20000000
+                         02000000 0 a0000000 a0000000 0 10000000
+                         01000000 0 00000000 b0000000 0 01000000>;
+       };
 };
index abd73a2c5e0ceff09a85aa7fe6d7a9addd7503bf..a8eadc8c44972e10819c0c51fb7e6325efff9df1 100644 (file)
                        interrupt-parent = < &ipic >;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x0E -mini PCI */
-                                        7000 0 0 1 &ipic 12 8
-                                        7000 0 0 2 &ipic 12 8
-                                        7000 0 0 3 &ipic 12 8
-                                        7000 0 0 4 &ipic 12 8
-
-                                       /* IDSEL 0x0F - PCI slot */
-                                        7800 0 0 1 &ipic 11 8
-                                        7800 0 0 2 &ipic 12 8
-                                        7800 0 0 3 &ipic 11 8
-                                        7800 0 0 4 &ipic 12 8>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 90000000 90000000 0 10000000
-                                 42000000 0 80000000 80000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                crypto@30000 {
                        device_type = "crypto";
                        model = "SEC2";
                        device_type = "ipic";
                };
        };
+
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                               /* IDSEL 0x0E -mini PCI */
+                                7000 0 0 1 &ipic 12 8
+                                7000 0 0 2 &ipic 12 8
+                                7000 0 0 3 &ipic 12 8
+                                7000 0 0 4 &ipic 12 8
+
+                               /* IDSEL 0x0F - PCI slot */
+                                7800 0 0 1 &ipic 11 8
+                                7800 0 0 2 &ipic 12 8
+                                7800 0 0 3 &ipic 11 8
+                                7800 0 0 4 &ipic 12 8>;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 90000000 90000000 0 10000000
+                         42000000 0 80000000 80000000 0 10000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
 };
index e88167dc18594577a5f5f311127f747ef6f62c09..fcd333c391ec15c285b1c23e370b5c24cf289c0d 100644 (file)
                        descriptor-types-mask = <0122003f>;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x11 AD17 */
-                                        8800 0 0 1 &ipic 14 8
-                                        8800 0 0 2 &ipic 15 8
-                                        8800 0 0 3 &ipic 16 8
-                                        8800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x12 AD18 */
-                                        9000 0 0 1 &ipic 16 8
-                                        9000 0 0 2 &ipic 17 8
-                                        9000 0 0 3 &ipic 14 8
-                                        9000 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x13 AD19 */
-                                        9800 0 0 1 &ipic 17 8
-                                        9800 0 0 2 &ipic 14 8
-                                        9800 0 0 3 &ipic 15 8
-                                        9800 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x15 AD21*/
-                                        a800 0 0 1 &ipic 14 8
-                                        a800 0 0 2 &ipic 15 8
-                                        a800 0 0 3 &ipic 16 8
-                                        a800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x16 AD22*/
-                                        b000 0 0 1 &ipic 17 8
-                                        b000 0 0 2 &ipic 14 8
-                                        b000 0 0 3 &ipic 15 8
-                                        b000 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x17 AD23*/
-                                        b800 0 0 1 &ipic 16 8
-                                        b800 0 0 2 &ipic 17 8
-                                        b800 0 0 3 &ipic 14 8
-                                        b800 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x18 AD24*/
-                                        c000 0 0 1 &ipic 15 8
-                                        c000 0 0 2 &ipic 16 8
-                                        c000 0 0 3 &ipic 17 8
-                                        c000 0 0 4 &ipic 14 8>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 90000000 90000000 0 10000000
-                                 42000000 0 80000000 80000000 0 10000000
-                                 01000000 0 00000000 d0000000 0 00100000>;
-                       clock-frequency = <0>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                ipic: pic@700 {
                        interrupt-controller;
                        #address-cells = <0>;
                        interrupt-parent = < &ipic >;
                };
        };
+
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                               /* IDSEL 0x11 AD17 */
+                                8800 0 0 1 &ipic 14 8
+                                8800 0 0 2 &ipic 15 8
+                                8800 0 0 3 &ipic 16 8
+                                8800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x12 AD18 */
+                                9000 0 0 1 &ipic 16 8
+                                9000 0 0 2 &ipic 17 8
+                                9000 0 0 3 &ipic 14 8
+                                9000 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x13 AD19 */
+                                9800 0 0 1 &ipic 17 8
+                                9800 0 0 2 &ipic 14 8
+                                9800 0 0 3 &ipic 15 8
+                                9800 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x15 AD21*/
+                                a800 0 0 1 &ipic 14 8
+                                a800 0 0 2 &ipic 15 8
+                                a800 0 0 3 &ipic 16 8
+                                a800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x16 AD22*/
+                                b000 0 0 1 &ipic 17 8
+                                b000 0 0 2 &ipic 14 8
+                                b000 0 0 3 &ipic 15 8
+                                b000 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x17 AD23*/
+                                b800 0 0 1 &ipic 16 8
+                                b800 0 0 2 &ipic 17 8
+                                b800 0 0 3 &ipic 14 8
+                                b800 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x18 AD24*/
+                                c000 0 0 1 &ipic 15 8
+                                c000 0 0 2 &ipic 16 8
+                                c000 0 0 3 &ipic 17 8
+                                c000 0 0 4 &ipic 14 8>;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 90000000 90000000 0 10000000
+                         42000000 0 80000000 80000000 0 10000000
+                         01000000 0 00000000 d0000000 0 00100000>;
+               clock-frequency = <0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
 };
index 01393e6d7da976741c72216fe06c13df6aab0de0..cdc4a94e9c289ca3eea40d91739ada833e894936 100644 (file)
                        descriptor-types-mask = <0122003f>;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x10 AD16 (USB) */
-                                        8000 0 0 1 &pic 11 8
-
-                                       /* IDSEL 0x11 AD17 (Mini1)*/
-                                        8800 0 0 1 &pic 12 8
-                                        8800 0 0 2 &pic 13 8
-                                        8800 0 0 3 &pic 14 8
-                                        8800 0 0 4 &pic 30 8
-
-                                       /* IDSEL 0x12 AD18 (PCI/Mini2) */
-                                        9000 0 0 1 &pic 13 8
-                                        9000 0 0 2 &pic 14 8
-                                        9000 0 0 3 &pic 30 8
-                                        9000 0 0 4 &pic 11 8>;
-
-                       interrupt-parent = <&pic>;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <42000000 0 80000000 80000000 0 10000000
-                                 02000000 0 90000000 90000000 0 10000000
-                                 01000000 0 d0000000 d0000000 0 04000000>;
-                       clock-frequency = <0>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                pic:pic@700 {
                        interrupt-controller;
                        #address-cells = <0>;
                        interrupt-parent = <&pic>;
                };
        };
+
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                               /* IDSEL 0x10 AD16 (USB) */
+                                8000 0 0 1 &pic 11 8
+
+                               /* IDSEL 0x11 AD17 (Mini1)*/
+                                8800 0 0 1 &pic 12 8
+                                8800 0 0 2 &pic 13 8
+                                8800 0 0 3 &pic 14 8
+                                8800 0 0 4 &pic 30 8
+
+                               /* IDSEL 0x12 AD18 (PCI/Mini2) */
+                                9000 0 0 1 &pic 13 8
+                                9000 0 0 2 &pic 14 8
+                                9000 0 0 3 &pic 30 8
+                                9000 0 0 4 &pic 11 8>;
+
+               interrupt-parent = <&pic>;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <42000000 0 80000000 80000000 0 10000000
+                         02000000 0 90000000 90000000 0 10000000
+                         01000000 0 d0000000 d0000000 0 04000000>;
+               clock-frequency = <0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
 };
index f98c785081bfd23a5df404e9d2022b0b2c1263a8..67781601b6b3bd0d715815fa946bac82398e69b4 100644 (file)
                        interrupt-parent = < &ipic >;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x10 - SATA */
-                                       8000 0 0 1 &ipic 16 8 /* SATA_INTA */
-                                       >;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <42000000 0 80000000 80000000 0 10000000
-                                 02000000 0 90000000 90000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 01000000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
-               pci@8600 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x0E - MiniPCI Slot */
-                                       7000 0 0 1 &ipic 15 8 /* PCI_INTA */
-
-                                       /* IDSEL 0x0F - PCI Slot */
-                                       7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                       7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                        >;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <43 8>;
-                       bus-range = <1 1>;
-                       ranges = <42000000 0 a0000000 a0000000 0 10000000
-                                 02000000 0 b0000000 b0000000 0 10000000
-                                 01000000 0 00000000 e3000000 0 01000000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8600 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                crypto@30000 {
                        device_type = "crypto";
                        model = "SEC2";
                        device_type = "ipic";
                };
        };
+
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                               /* IDSEL 0x10 - SATA */
+                               8000 0 0 1 &ipic 16 8 /* SATA_INTA */
+                               >;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <42000000 0 80000000 80000000 0 10000000
+                         02000000 0 90000000 90000000 0 10000000
+                         01000000 0 00000000 e2000000 0 01000000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
+
+       pci@e0008600 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                               /* IDSEL 0x0E - MiniPCI Slot */
+                               7000 0 0 1 &ipic 15 8 /* PCI_INTA */
+
+                               /* IDSEL 0x0F - PCI Slot */
+                               7800 0 0 1 &ipic 14 8 /* PCI_INTA */
+                               7800 0 0 2 &ipic 15 8 /* PCI_INTB */
+                                >;
+               interrupt-parent = < &ipic >;
+               interrupts = <43 8>;
+               bus-range = <0 0>;
+               ranges = <42000000 0 a0000000 a0000000 0 10000000
+                         02000000 0 b0000000 b0000000 0 10000000
+                         01000000 0 00000000 e3000000 0 01000000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008600 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
+
+
+
 };
index 7c89ff7f6a37d6879b777e8a2d5d08418d2d5139..fa852ba1b6ba7de9db6d6adc22e90e32798d1092 100644 (file)
                        interrupt-parent = < &ipic >;
                };
 
-               pci@8600 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x0F - PCI Slot */
-                                       7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                       7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                        >;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <43 8>;
-                       bus-range = <1 1>;
-                       ranges = <42000000 0 a0000000 a0000000 0 10000000
-                                 02000000 0 b0000000 b0000000 0 10000000
-                                 01000000 0 00000000 e3000000 0 01000000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8600 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                crypto@30000 {
                        device_type = "crypto";
                        model = "SEC2";
                        device_type = "ipic";
                };
        };
+
+       pci@e0008600 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                               /* IDSEL 0x0F - PCI Slot */
+                               7800 0 0 1 &ipic 14 8 /* PCI_INTA */
+                               7800 0 0 2 &ipic 15 8 /* PCI_INTB */
+                                >;
+               interrupt-parent = < &ipic >;
+               interrupts = <43 8>;
+               bus-range = <1 1>;
+               ranges = <42000000 0 a0000000 a0000000 0 10000000
+                         02000000 0 b0000000 b0000000 0 10000000
+                         01000000 0 00000000 e3000000 0 01000000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008600 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
 };
index f4ba857754098941b81ac4f05fdd5c6fd493bd94..1b8882e2004021f3df12390d383c3e3267cc40f9 100644 (file)
                        interrupt-parent = < &ipic >;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x11 */
-                                        8800 0 0 1 &ipic 14 8
-                                        8800 0 0 2 &ipic 15 8
-                                        8800 0 0 3 &ipic 16 8
-                                        8800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x12 */
-                                        9000 0 0 1 &ipic 16 8
-                                        9000 0 0 2 &ipic 17 8
-                                        9000 0 0 3 &ipic 14 8
-                                        9000 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x13 */
-                                        9800 0 0 1 &ipic 17 8
-                                        9800 0 0 2 &ipic 14 8
-                                        9800 0 0 3 &ipic 15 8
-                                        9800 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x15 */
-                                        a800 0 0 1 &ipic 14 8
-                                        a800 0 0 2 &ipic 15 8
-                                        a800 0 0 3 &ipic 16 8
-                                        a800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x16 */
-                                        b000 0 0 1 &ipic 17 8
-                                        b000 0 0 2 &ipic 14 8
-                                        b000 0 0 3 &ipic 15 8
-                                        b000 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x17 */
-                                        b800 0 0 1 &ipic 16 8
-                                        b800 0 0 2 &ipic 17 8
-                                        b800 0 0 3 &ipic 14 8
-                                        b800 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x18 */
-                                        c000 0 0 1 &ipic 15 8
-                                        c000 0 0 2 &ipic 16 8
-                                        c000 0 0 3 &ipic 17 8
-                                        c000 0 0 4 &ipic 14 8>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 90000000 90000000 0 10000000
-                                 42000000 0 80000000 80000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
-               pci@8600 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x11 */
-                                        8800 0 0 1 &ipic 14 8
-                                        8800 0 0 2 &ipic 15 8
-                                        8800 0 0 3 &ipic 16 8
-                                        8800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x12 */
-                                        9000 0 0 1 &ipic 16 8
-                                        9000 0 0 2 &ipic 17 8
-                                        9000 0 0 3 &ipic 14 8
-                                        9000 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x13 */
-                                        9800 0 0 1 &ipic 17 8
-                                        9800 0 0 2 &ipic 14 8
-                                        9800 0 0 3 &ipic 15 8
-                                        9800 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x15 */
-                                        a800 0 0 1 &ipic 14 8
-                                        a800 0 0 2 &ipic 15 8
-                                        a800 0 0 3 &ipic 16 8
-                                        a800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x16 */
-                                        b000 0 0 1 &ipic 17 8
-                                        b000 0 0 2 &ipic 14 8
-                                        b000 0 0 3 &ipic 15 8
-                                        b000 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x17 */
-                                        b800 0 0 1 &ipic 16 8
-                                        b800 0 0 2 &ipic 17 8
-                                        b800 0 0 3 &ipic 14 8
-                                        b800 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x18 */
-                                        c000 0 0 1 &ipic 15 8
-                                        c000 0 0 2 &ipic 16 8
-                                        c000 0 0 3 &ipic 17 8
-                                        c000 0 0 4 &ipic 14 8>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 b0000000 b0000000 0 10000000
-                                 42000000 0 a0000000 a0000000 0 10000000
-                                 01000000 0 00000000 e2100000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8600 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                /* May need to remove if on a part without crypto engine */
                crypto@30000 {
                        device_type = "crypto";
                        device_type = "ipic";
                };
        };
+
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                               /* IDSEL 0x11 */
+                                8800 0 0 1 &ipic 14 8
+                                8800 0 0 2 &ipic 15 8
+                                8800 0 0 3 &ipic 16 8
+                                8800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x12 */
+                                9000 0 0 1 &ipic 16 8
+                                9000 0 0 2 &ipic 17 8
+                                9000 0 0 3 &ipic 14 8
+                                9000 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x13 */
+                                9800 0 0 1 &ipic 17 8
+                                9800 0 0 2 &ipic 14 8
+                                9800 0 0 3 &ipic 15 8
+                                9800 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x15 */
+                                a800 0 0 1 &ipic 14 8
+                                a800 0 0 2 &ipic 15 8
+                                a800 0 0 3 &ipic 16 8
+                                a800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x16 */
+                                b000 0 0 1 &ipic 17 8
+                                b000 0 0 2 &ipic 14 8
+                                b000 0 0 3 &ipic 15 8
+                                b000 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x17 */
+                                b800 0 0 1 &ipic 16 8
+                                b800 0 0 2 &ipic 17 8
+                                b800 0 0 3 &ipic 14 8
+                                b800 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x18 */
+                                c000 0 0 1 &ipic 15 8
+                                c000 0 0 2 &ipic 16 8
+                                c000 0 0 3 &ipic 17 8
+                                c000 0 0 4 &ipic 14 8>;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 90000000 90000000 0 10000000
+                         42000000 0 80000000 80000000 0 10000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
+
+       pci@e0008600 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                               /* IDSEL 0x11 */
+                                8800 0 0 1 &ipic 14 8
+                                8800 0 0 2 &ipic 15 8
+                                8800 0 0 3 &ipic 16 8
+                                8800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x12 */
+                                9000 0 0 1 &ipic 16 8
+                                9000 0 0 2 &ipic 17 8
+                                9000 0 0 3 &ipic 14 8
+                                9000 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x13 */
+                                9800 0 0 1 &ipic 17 8
+                                9800 0 0 2 &ipic 14 8
+                                9800 0 0 3 &ipic 15 8
+                                9800 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x15 */
+                                a800 0 0 1 &ipic 14 8
+                                a800 0 0 2 &ipic 15 8
+                                a800 0 0 3 &ipic 16 8
+                                a800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x16 */
+                                b000 0 0 1 &ipic 17 8
+                                b000 0 0 2 &ipic 14 8
+                                b000 0 0 3 &ipic 15 8
+                                b000 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x17 */
+                                b800 0 0 1 &ipic 16 8
+                                b800 0 0 2 &ipic 17 8
+                                b800 0 0 3 &ipic 14 8
+                                b800 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x18 */
+                                c000 0 0 1 &ipic 15 8
+                                c000 0 0 2 &ipic 16 8
+                                c000 0 0 3 &ipic 17 8
+                                c000 0 0 4 &ipic 14 8>;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 b0000000 b0000000 0 10000000
+                         42000000 0 a0000000 a0000000 0 10000000
+                         01000000 0 00000000 e2100000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008600 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
 };
index f14e88ee0f1cf1d748a6cf2ac254822c8dabaff4..fbd1573c348b5601bab89a5cbca5b15d7b1521ca 100644 (file)
                        descriptor-types-mask = <01010ebf>;
                };
 
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x11 AD17 */
-                                        8800 0 0 1 &ipic 14 8
-                                        8800 0 0 2 &ipic 15 8
-                                        8800 0 0 3 &ipic 16 8
-                                        8800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x12 AD18 */
-                                        9000 0 0 1 &ipic 16 8
-                                        9000 0 0 2 &ipic 17 8
-                                        9000 0 0 3 &ipic 14 8
-                                        9000 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x13 AD19 */
-                                        9800 0 0 1 &ipic 17 8
-                                        9800 0 0 2 &ipic 14 8
-                                        9800 0 0 3 &ipic 15 8
-                                        9800 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x15 AD21*/
-                                        a800 0 0 1 &ipic 14 8
-                                        a800 0 0 2 &ipic 15 8
-                                        a800 0 0 3 &ipic 16 8
-                                        a800 0 0 4 &ipic 17 8
-
-                                       /* IDSEL 0x16 AD22*/
-                                        b000 0 0 1 &ipic 17 8
-                                        b000 0 0 2 &ipic 14 8
-                                        b000 0 0 3 &ipic 15 8
-                                        b000 0 0 4 &ipic 16 8
-
-                                       /* IDSEL 0x17 AD23*/
-                                        b800 0 0 1 &ipic 16 8
-                                        b800 0 0 2 &ipic 17 8
-                                        b800 0 0 3 &ipic 14 8
-                                        b800 0 0 4 &ipic 15 8
-
-                                       /* IDSEL 0x18 AD24*/
-                                        c000 0 0 1 &ipic 15 8
-                                        c000 0 0 2 &ipic 16 8
-                                        c000 0 0 3 &ipic 17 8
-                                        c000 0 0 4 &ipic 14 8>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 a0000000 a0000000 0 10000000
-                                 42000000 0 80000000 80000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
                ipic: pic@700 {
                        interrupt-controller;
                        #address-cells = <0>;
                        interrupts = <20 8 21 8>; //high:32 low:33
                        interrupt-parent = < &ipic >;
                };
+       };
 
+       pci@e0008500 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                               /* IDSEL 0x11 AD17 */
+                                8800 0 0 1 &ipic 14 8
+                                8800 0 0 2 &ipic 15 8
+                                8800 0 0 3 &ipic 16 8
+                                8800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x12 AD18 */
+                                9000 0 0 1 &ipic 16 8
+                                9000 0 0 2 &ipic 17 8
+                                9000 0 0 3 &ipic 14 8
+                                9000 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x13 AD19 */
+                                9800 0 0 1 &ipic 17 8
+                                9800 0 0 2 &ipic 14 8
+                                9800 0 0 3 &ipic 15 8
+                                9800 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x15 AD21*/
+                                a800 0 0 1 &ipic 14 8
+                                a800 0 0 2 &ipic 15 8
+                                a800 0 0 3 &ipic 16 8
+                                a800 0 0 4 &ipic 17 8
+
+                               /* IDSEL 0x16 AD22*/
+                                b000 0 0 1 &ipic 17 8
+                                b000 0 0 2 &ipic 14 8
+                                b000 0 0 3 &ipic 15 8
+                                b000 0 0 4 &ipic 16 8
+
+                               /* IDSEL 0x17 AD23*/
+                                b800 0 0 1 &ipic 16 8
+                                b800 0 0 2 &ipic 17 8
+                                b800 0 0 3 &ipic 14 8
+                                b800 0 0 4 &ipic 15 8
+
+                               /* IDSEL 0x18 AD24*/
+                                c000 0 0 1 &ipic 15 8
+                                c000 0 0 2 &ipic 16 8
+                                c000 0 0 3 &ipic 17 8
+                                c000 0 0 4 &ipic 14 8>;
+               interrupt-parent = < &ipic >;
+               interrupts = <42 8>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 a0000000 a0000000 0 10000000
+                         42000000 0 80000000 80000000 0 10000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008500 100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
        };
 };
index e038c04b42203ad3fb1b539acc674fb98bac484f..6442a717ec3bf7532477372b9fd74b5f8a92d167 100644 (file)
                        interrupts = <2a 2>;
                        interrupt-parent = <&mpic>;
                };
-               pci@8000 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
+               mpic: pic@40000 {
+                       clock-frequency = <0>;
+                       interrupt-controller;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       reg = <40000 40000>;
+                       compatible = "chrp,open-pic";
+                       device_type = "open-pic";
+                       big-endian;
+               };
+       };
 
-                               /* IDSEL 0x02 */
-                               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
+       pci@e0008000 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
 
-                               /* IDSEL 0x03 */
-                               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 0x02 */
+                       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 0x04 */
-                               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 0x03 */
+                       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 0x05 */
-                               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 0x04 */
+                       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 0x0c */
-                               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 0x05 */
+                       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 0x0d */
-                               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 0x0c */
+                       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 0x0e */
-                               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 0x0d */
+                       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 0x0f */
-                               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 0x0e */
+                       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 0x12 */
-                               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 0x0f */
+                       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 0x13 */
-                               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 0x12 */
+                       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 0x14 */
-                               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 0x13 */
+                       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 0x15 */
-                               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 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8000 1000>;
-                       compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                       device_type = "pci";
-               };
+                       /* IDSEL 0x14 */
+                       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
 
-               mpic: pic@40000 {
-                       clock-frequency = <0>;
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <40000 40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-                       big-endian;
-               };
+                       /* IDSEL 0x15 */
+                       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 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008000 1000>;
+               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+               device_type = "pci";
        };
 };
index 98afd4df27bf5f067908f99937041d61ee58430a..6633e07d9f4d2039e8b6a72b795091d9f8b75cd5 100644 (file)
@@ -43,7 +43,7 @@
                #size-cells = <1>;
                device_type = "soc";
                ranges = <0 e0000000 00100000>;
-               reg = <e0000000 00100000>;      // CCSRBAR 1M
+               reg = <e0000000 00001000>;      // CCSRBAR 1M
                bus-frequency = <0>;
 
                memory-controller@2000 {
                        interrupt-parent = <&mpic>;
                };
 
-               pci1: pci@8000 {
-                       interrupt-map-mask = <1f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x10 */
-                               08000 0 0 1 &mpic 0 1
-                               08000 0 0 2 &mpic 1 1
-                               08000 0 0 3 &mpic 2 1
-                               08000 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x11 */
-                               08800 0 0 1 &mpic 0 1
-                               08800 0 0 2 &mpic 1 1
-                               08800 0 0 3 &mpic 2 1
-                               08800 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 &mpic 0 1
-                               09000 0 0 2 &mpic 1 1
-                               09000 0 0 3 &mpic 2 1
-                               09000 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 &mpic 1 1
-                               09800 0 0 2 &mpic 2 1
-                               09800 0 0 3 &mpic 3 1
-                               09800 0 0 4 &mpic 0 1
-
-                               /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 &mpic 2 1
-                               0a000 0 0 2 &mpic 3 1
-                               0a000 0 0 3 &mpic 0 1
-                               0a000 0 0 4 &mpic 1 1
-
-                               /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 &mpic 3 1
-                               0a800 0 0 2 &mpic 0 1
-                               0a800 0 0 3 &mpic 1 1
-                               0a800 0 0 4 &mpic 2 1
-
-                               /* Bus 1 (Tundra Bridge) */
-                               /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 &mpic 0 1
-                               19000 0 0 2 &mpic 1 1
-                               19000 0 0 3 &mpic 2 1
-                               19000 0 0 4 &mpic 3 1>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8000 1000>;
-                       compatible = "fsl,mpc8540-pci";
-                       device_type = "pci";
-
-                       i8259@19000 {
-                               interrupt-controller;
-                               device_type = "interrupt-controller";
-                               reg = <19000 0 0 0 1>;
-                               #address-cells = <0>;
-                               #interrupt-cells = <2>;
-                               compatible = "chrp,iic";
-                               interrupts = <1>;
-                               interrupt-parent = <&pci1>;
-                       };
-               };
-
-               pci@9000 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x15 */
-                               a800 0 0 1 &mpic b 1
-                               a800 0 0 2 &mpic b 1
-                               a800 0 0 3 &mpic b 1
-                               a800 0 0 4 &mpic b 1>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <19 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                 01000000 0 00000000 e3000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <9000 1000>;
-                       compatible = "fsl,mpc8540-pci";
-                       device_type = "pci";
-               };
-
                mpic: pic@40000 {
                        clock-frequency = <0>;
                        interrupt-controller;
                         big-endian;
                };
        };
+
+       pci1: pci@e0008000 {
+               interrupt-map-mask = <1f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x10 */
+                       08000 0 0 1 &mpic 0 1
+                       08000 0 0 2 &mpic 1 1
+                       08000 0 0 3 &mpic 2 1
+                       08000 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x11 */
+                       08800 0 0 1 &mpic 0 1
+                       08800 0 0 2 &mpic 1 1
+                       08800 0 0 3 &mpic 2 1
+                       08800 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x12 (Slot 1) */
+                       09000 0 0 1 &mpic 0 1
+                       09000 0 0 2 &mpic 1 1
+                       09000 0 0 3 &mpic 2 1
+                       09000 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x13 (Slot 2) */
+                       09800 0 0 1 &mpic 1 1
+                       09800 0 0 2 &mpic 2 1
+                       09800 0 0 3 &mpic 3 1
+                       09800 0 0 4 &mpic 0 1
+
+                       /* IDSEL 0x14 (Slot 3) */
+                       0a000 0 0 1 &mpic 2 1
+                       0a000 0 0 2 &mpic 3 1
+                       0a000 0 0 3 &mpic 0 1
+                       0a000 0 0 4 &mpic 1 1
+
+                       /* IDSEL 0x15 (Slot 4) */
+                       0a800 0 0 1 &mpic 3 1
+                       0a800 0 0 2 &mpic 0 1
+                       0a800 0 0 3 &mpic 1 1
+                       0a800 0 0 4 &mpic 2 1
+
+                       /* Bus 1 (Tundra Bridge) */
+                       /* IDSEL 0x12 (ISA bridge) */
+                       19000 0 0 1 &mpic 0 1
+                       19000 0 0 2 &mpic 1 1
+                       19000 0 0 3 &mpic 2 1
+                       19000 0 0 4 &mpic 3 1>;
+               interrupt-parent = <&mpic>;
+               interrupts = <18 2>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 80000000 80000000 0 20000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008000 1000>;
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+
+               i8259@19000 {
+                       interrupt-controller;
+                       device_type = "interrupt-controller";
+                       reg = <19000 0 0 0 1>;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       compatible = "chrp,iic";
+                       interrupts = <1>;
+                       interrupt-parent = <&pci1>;
+               };
+       };
+
+       pci@e0009000 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x15 */
+                       a800 0 0 1 &mpic b 1
+                       a800 0 0 2 &mpic b 1
+                       a800 0 0 3 &mpic b 1
+                       a800 0 0 4 &mpic b 1>;
+               interrupt-parent = <&mpic>;
+               interrupts = <19 2>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 a0000000 a0000000 0 20000000
+                         01000000 0 00000000 e3000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0009000 1000>;
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+       };
 };
index 88082ac6f2cdb6dce7ea8b8e8c37fdaa85f730bf..3f9d15cf13e0121e919a037b8d686ea6425b9360 100644 (file)
                #size-cells = <1>;
                device_type = "soc";
 
-
-               ranges = <00001000 e0001000 000ff000
-                         80000000 80000000 20000000
-                         a0000000 a0000000 10000000
-                         b0000000 b0000000 00100000
-                         c0000000 c0000000 20000000
-                         b0100000 b0100000 00100000
-                         e1000000 e1000000 00010000
-                         e1010000 e1010000 00010000
-                         e1020000 e1020000 00010000>;
+               ranges = <00000000 e0000000 00100000>;
                reg = <e0000000 00001000>;      // CCSRBAR 1M
                bus-frequency = <0>;            // Filled out by uboot.
 
                        interrupt-parent = <&mpic>;
                };
 
-               pci@8000 {
-                       compatible = "fsl,mpc8540-pci";
-                       device_type = "pci";
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x11 J17 Slot 1 */
-                               8800 0 0 1 &mpic 2 1
-                               8800 0 0 2 &mpic 3 1
-                               8800 0 0 3 &mpic 4 1
-                               8800 0 0 4 &mpic 1 1
+               global-utilities@e0000 {        //global utilities block
+                       compatible = "fsl,mpc8548-guts";
+                       reg = <e0000 1000>;
+                       fsl,has-rstcr;
+               };
 
-                               /* IDSEL 0x12 J16 Slot 2 */
+               mpic: pic@40000 {
+                       clock-frequency = <0>;
+                       interrupt-controller;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       reg = <40000 40000>;
+                       compatible = "chrp,open-pic";
+                       device_type = "open-pic";
+                       big-endian;
+               };
+       };
 
-                               9000 0 0 1 &mpic 3 1
-                               9000 0 0 2 &mpic 4 1
-                               9000 0 0 3 &mpic 2 1
-                               9000 0 0 4 &mpic 1 1>;
+       pci@e0008000 {
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x11 J17 Slot 1 */
+                       8800 0 0 1 &mpic 2 1
+                       8800 0 0 2 &mpic 3 1
+                       8800 0 0 3 &mpic 4 1
+                       8800 0 0 4 &mpic 1 1
+
+                       /* IDSEL 0x12 J16 Slot 2 */
+
+                       9000 0 0 1 &mpic 3 1
+                       9000 0 0 2 &mpic 4 1
+                       9000 0 0 3 &mpic 2 1
+                       9000 0 0 4 &mpic 1 1>;
+
+               interrupt-parent = <&mpic>;
+               interrupts = <18 2>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 c0000000 c0000000 0 20000000
+                         01000000 0 00000000 e1000000 0 00010000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008000 1000>;
+       };
 
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 c0000000 c0000000 0 20000000
-                                 01000000 0 00000000 e1000000 0 00010000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
+       pcie@e0009000 {
+               compatible = "fsl,mpc8548-pcie";
+               device_type = "pci";
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0009000 1000>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 80000000 80000000 0 20000000
+                         01000000 0 00000000 e1010000 0 00010000>;
+               clock-frequency = <1fca055>;
+               interrupt-parent = <&mpic>;
+               interrupts = <1a 2>;
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       0000 0 0 1 &mpic 4 1
+                       0000 0 0 2 &mpic 5 1
+                       0000 0 0 3 &mpic 6 1
+                       0000 0 0 4 &mpic 7 1
+                       >;
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <8000 1000>;
-               };
-
-               pcie@9000 {
-                       compatible = "fsl,mpc8548-pcie";
                        device_type = "pci";
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <9000 1000>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e1010000 0 00010000>;
-                       clock-frequency = <1fca055>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <1a 2>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 4 1
-                               0000 0 0 2 &mpic 5 1
-                               0000 0 0 3 &mpic 6 1
-                               0000 0 0 4 &mpic 7 1
-                               >;
+                       ranges = <02000000 0 80000000
+                                 02000000 0 80000000
+                                 0 20000000
+
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00010000>;
                };
+       };
 
-               pcie@a000 {
-                       compatible = "fsl,mpc8548-pcie";
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
+       pcie@e000a000 {
+               compatible = "fsl,mpc8548-pcie";
+               device_type = "pci";
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e000a000 1000>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 a0000000 a0000000 0 10000000
+                         01000000 0 00000000 e1020000 0 00010000>;
+               clock-frequency = <1fca055>;
+               interrupt-parent = <&mpic>;
+               interrupts = <19 2>;
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       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
+                       >;
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <a000 1000>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 a0000000 a0000000 0 10000000
-                                 01000000 0 00000000 e1020000 0 00010000>;
-                       clock-frequency = <1fca055>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <19 2>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               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
-                               >;
+                       device_type = "pci";
+                       ranges = <02000000 0 a0000000
+                                 02000000 0 a0000000
+                                 0 10000000
+
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00010000>;
                };
+       };
 
-               pcie@b000 {
-                       compatible = "fsl,mpc8548-pcie";
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
+       pcie@e000b000 {
+               compatible = "fsl,mpc8548-pcie";
+               device_type = "pci";
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e000b000 1000>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 b0000000 b0000000 0 00100000
+                         01000000 0 00000000 b0100000 0 00100000>;
+               clock-frequency = <1fca055>;
+               interrupt-parent = <&mpic>;
+               interrupts = <1b 2>;
+               interrupt-map-mask = <fb00 0 0 0>;
+               interrupt-map = <
+                       // IDSEL 0x1c  USB
+                       e000 0 0 0 &i8259 c 2
+                       e100 0 0 0 &i8259 9 2
+                       e200 0 0 0 &i8259 a 2
+                       e300 0 0 0 &i8259 b 2
+
+                       // IDSEL 0x1d  Audio
+                       e800 0 0 0 &i8259 6 2
+
+                       // IDSEL 0x1e Legacy
+                       f000 0 0 0 &i8259 7 2
+                       f100 0 0 0 &i8259 7 2
+
+                       // IDSEL 0x1f IDE/SATA
+                       f800 0 0 0 &i8259 e 2
+                       f900 0 0 0 &i8259 5 2
+               >;
+
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <b000 1000>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 b0000000 b0000000 0 00100000
-                                 01000000 0 00000000 b0100000 0 00100000>;
-                       clock-frequency = <1fca055>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <1b 2>;
-                       interrupt-map-mask = <fb00 0 0 0>;
-                       interrupt-map = <
-                               // IDSEL 0x1c  USB
-                               e000 0 0 0 &i8259 c 2
-                               e100 0 0 0 &i8259 9 2
-                               e200 0 0 0 &i8259 a 2
-                               e300 0 0 0 &i8259 b 2
-
-                               // IDSEL 0x1d  Audio
-                               e800 0 0 0 &i8259 6 2
-
-                               // IDSEL 0x1e Legacy
-                               f000 0 0 0 &i8259 7 2
-                               f100 0 0 0 &i8259 7 2
-
-                               // IDSEL 0x1f IDE/SATA
-                               f800 0 0 0 &i8259 e 2
-                               f900 0 0 0 &i8259 5 2
-                       >;
+                       device_type = "pci";
+                       ranges = <02000000 0 b0000000
+                                 02000000 0 b0000000
+                                 0 00100000
+
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00100000>;
+
                        uli1575@0 {
                                reg = <0 0 0 0 0>;
                                #size-cells = <2>;
                                ranges = <02000000 0 b0000000
                                          02000000 0 b0000000
                                          0 00100000
+
                                          01000000 0 00000000
                                          01000000 0 00000000
                                          0 00100000>;
-
-                               pci_bridge@0 {
-                                       reg = <0 0 0 0 0>;
-                                       #size-cells = <2>;
-                                       #address-cells = <3>;
-                                       ranges = <02000000 0 b0000000
-                                                 02000000 0 b0000000
-                                                 0 00100000
-                                                 01000000 0 00000000
-                                                 01000000 0 00000000
-                                                 0 00100000>; 
-
-                                       isa@1e {
-                                               device_type = "isa";
+                               isa@1e {
+                                       device_type = "isa";
+                                       #interrupt-cells = <2>;
+                                       #size-cells = <1>;
+                                       #address-cells = <2>;
+                                       reg = <f000 0 0 0 0>;
+                                       ranges = <1 0
+                                                 01000000 0 0
+                                                 00001000>;
+                                       interrupt-parent = <&i8259>;
+
+                                       i8259: interrupt-controller@20 {
+                                               reg = <1 20 2
+                                                      1 a0 2
+                                                      1 4d0 2>;
+                                               interrupt-controller;
+                                               device_type = "interrupt-controller";
+                                               #address-cells = <0>;
                                                #interrupt-cells = <2>;
-                                               #size-cells = <1>;
-                                               #address-cells = <2>;
-                                               reg = <f000 0 0 0 0>;
-                                               ranges = <1 0
-                                                         01000000 0 0
-                                                         00001000>;
+                                               compatible = "chrp,iic";
+                                               interrupts = <9 2>;
+                                               interrupt-parent = <&mpic>;
+                                       };
+
+                                       i8042@60 {
+                                               #size-cells = <0>;
+                                               #address-cells = <1>;
+                                               reg = <1 60 1 1 64 1>;
+                                               interrupts = <1 3 c 3>;
                                                interrupt-parent = <&i8259>;
 
-                                               i8259: interrupt-controller@20 {
-                                                       reg = <1 20 2
-                                                              1 a0 2
-                                                              1 4d0 2>;
-                                                       interrupt-controller;
-                                                       device_type = "interrupt-controller";
-                                                       #address-cells = <0>;
-                                                       #interrupt-cells = <2>;
-                                                       compatible = "chrp,iic";
-                                                       interrupts = <9 2>;
-                                                       interrupt-parent = <&mpic>;
+                                               keyboard@0 {
+                                                       reg = <0>;
+                                                       compatible = "pnpPNP,303";
                                                };
 
-                                               i8042@60 {
-                                                       #size-cells = <0>;
-                                                       #address-cells = <1>;
-                                                       reg = <1 60 1 1 64 1>;
-                                                       interrupts = <1 3 c 3>;
-                                                       interrupt-parent = <&i8259>;
-
-                                                       keyboard@0 {
-                                                               reg = <0>;
-                                                               compatible = "pnpPNP,303";
-                                                       };
-
-                                                       mouse@1 {
-                                                               reg = <1>;
-                                                               compatible = "pnpPNP,f03";
-                                                       };
+                                               mouse@1 {
+                                                       reg = <1>;
+                                                       compatible = "pnpPNP,f03";
                                                };
+                                       };
 
-                                               rtc@70 {
-                                                       compatible = "pnpPNP,b00";
-                                                       reg = <1 70 2>;
-                                               };
+                                       rtc@70 {
+                                               compatible = "pnpPNP,b00";
+                                               reg = <1 70 2>;
+                                       };
 
-                                               gpio@400 {
-                                                       reg = <1 400 80>;
-                                               };
+                                       gpio@400 {
+                                               reg = <1 400 80>;
                                        };
                                };
                        };
-
                };
 
-               global-utilities@e0000 {        //global utilities block
-                       compatible = "fsl,mpc8548-guts";
-                       reg = <e0000 1000>;
-                       fsl,has-rstcr;
-               };
-
-               mpic: pic@40000 {
-                       clock-frequency = <0>;
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <40000 40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-                       big-endian;
-               };
        };
 };
index 11b823595a08a77eb05c4754d4533b31359f290a..69ca5025d9723cc143b2e0e711c4ba50d6f0304f 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
-               ranges = <00001000 e0001000 000ff000
-                         80000000 80000000 10000000
-                         e2000000 e2000000 00800000
-                         90000000 90000000 10000000
-                         e2800000 e2800000 00800000
-                         a0000000 a0000000 20000000
-                         e3000000 e3000000 01000000>;
+               ranges = <00000000 e0000000 00100000>;
                reg = <e0000000 00001000>;      // CCSRBAR
                bus-frequency = <0>;
 
                        fsl,has-rstcr;
                };
 
-               pci@8000 {
+               mpic: pic@40000 {
+                       clock-frequency = <0>;
+                       interrupt-controller;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       reg = <40000 40000>;
+                       compatible = "chrp,open-pic";
+                       device_type = "open-pic";
+                        big-endian;
+               };
+       };
+
+       pci@e0008000 {
+               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>;
+
+               interrupt-parent = <&mpic>;
+               interrupts = <18 2>;
+               bus-range = <0 0>;
+               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 = <e0008000 1000>;
+               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+               device_type = "pci";
+
+               pci_bridge@1c {
                        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>;
 
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 00800000>;
-                       clock-frequency = <3f940aa>;
+                               /* 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>;
-                       reg = <8000 1000>;
-                       compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                       device_type = "pci";
+                       ranges = <02000000 0 80000000
+                                 02000000 0 80000000
+                                 0 20000000
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00080000>;
+                       clock-frequency = <1fca055>;
 
-                       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";
+                       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>;
-                                       #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>;
-                                       };
+                                       compatible = "chrp,iic";
+                                       interrupts = <0 1>;
+                                       interrupt-parent = <&mpic>;
                                };
-                       };
-               };
 
-               pci@9000 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x15 */
-                               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 = <19 2>;
-                       bus-range = <0 0>;
-                       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 = "fsl,mpc8540-pci";
-                       device_type = "pci";
+                               rtc@70 {
+                                       compatible = "pnpPNP,b00";
+                                       reg = <1 70 2>;
+                               };
+                       };
                };
-               /* 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>;
+       pci@e0009000 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x15 */
+                       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 = <19 2>;
+               bus-range = <0 0>;
+               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 = <e0009000 1000>;
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+       };
 
-                       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>;
+       pcie@e000a000 {
+               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 = <e000a000 1000>;
+               compatible = "fsl,mpc8548-pcie";
+               device_type = "pci";
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <a000 1000>;
-                       compatible = "fsl,mpc8548-pcie";
                        device_type = "pci";
-               };
+                       ranges = <02000000 0 a0000000
+                                 02000000 0 a0000000
+                                 0 20000000
 
-               mpic: pic@40000 {
-                       clock-frequency = <0>;
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <40000 40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-                        big-endian;
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 08000000>;
                };
        };
 };
index ce11d11293d082e8728a26de1297f36bc926b613..99199295147e5d28c35900bea083fdfad2b753a9 100644 (file)
@@ -43,7 +43,7 @@
                #size-cells = <1>;
                device_type = "soc";
                ranges = <0 e0000000 00100000>;
-               reg = <e0000000 00100000>;      // CCSRBAR 1M
+               reg = <e0000000 00001000>;      // CCSRBAR 1M
                bus-frequency = <0>;
 
                memory-controller@2000 {
                        interrupt-parent = <&mpic>;
                };
 
-               pci1: pci@8000 {
-                       interrupt-map-mask = <1f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x10 */
-                               08000 0 0 1 &mpic 0 1
-                               08000 0 0 2 &mpic 1 1
-                               08000 0 0 3 &mpic 2 1
-                               08000 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x11 */
-                               08800 0 0 1 &mpic 0 1
-                               08800 0 0 2 &mpic 1 1
-                               08800 0 0 3 &mpic 2 1
-                               08800 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x12 (Slot 1) */
-                               09000 0 0 1 &mpic 0 1
-                               09000 0 0 2 &mpic 1 1
-                               09000 0 0 3 &mpic 2 1
-                               09000 0 0 4 &mpic 3 1
-
-                               /* IDSEL 0x13 (Slot 2) */
-                               09800 0 0 1 &mpic 1 1
-                               09800 0 0 2 &mpic 2 1
-                               09800 0 0 3 &mpic 3 1
-                               09800 0 0 4 &mpic 0 1
-
-                               /* IDSEL 0x14 (Slot 3) */
-                               0a000 0 0 1 &mpic 2 1
-                               0a000 0 0 2 &mpic 3 1
-                               0a000 0 0 3 &mpic 0 1
-                               0a000 0 0 4 &mpic 1 1
-
-                               /* IDSEL 0x15 (Slot 4) */
-                               0a800 0 0 1 &mpic 3 1
-                               0a800 0 0 2 &mpic 0 1
-                               0a800 0 0 3 &mpic 1 1
-                               0a800 0 0 4 &mpic 2 1
-
-                               /* Bus 1 (Tundra Bridge) */
-                               /* IDSEL 0x12 (ISA bridge) */
-                               19000 0 0 1 &mpic 0 1
-                               19000 0 0 2 &mpic 1 1
-                               19000 0 0 3 &mpic 2 1
-                               19000 0 0 4 &mpic 3 1>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8000 1000>;
-                       compatible = "fsl,mpc8540-pci";
-                       device_type = "pci";
-
-                       i8259@19000 {
-                               interrupt-controller;
-                               device_type = "interrupt-controller";
-                               reg = <19000 0 0 0 1>;
-                               #address-cells = <0>;
-                               #interrupt-cells = <2>;
-                               compatible = "chrp,iic";
-                               interrupts = <1>;
-                               interrupt-parent = <&pci1>;
-                       };
-               };
-
-               pci@9000 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                               /* IDSEL 0x15 */
-                               a800 0 0 1 &mpic b 1
-                               a800 0 0 2 &mpic b 1
-                               a800 0 0 3 &mpic b 1
-                               a800 0 0 4 &mpic b 1>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <19 2>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                 01000000 0 00000000 e3000000 0 00100000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <9000 1000>;
-                       compatible = "fsl,mpc8540-pci";
-                       device_type = "pci";
-               };
-
                mpic: pic@40000 {
                        clock-frequency = <0>;
                        interrupt-controller;
                         big-endian;
                };
        };
+
+       pci1: pci@e0008000 {
+               interrupt-map-mask = <1f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x10 */
+                       08000 0 0 1 &mpic 0 1
+                       08000 0 0 2 &mpic 1 1
+                       08000 0 0 3 &mpic 2 1
+                       08000 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x11 */
+                       08800 0 0 1 &mpic 0 1
+                       08800 0 0 2 &mpic 1 1
+                       08800 0 0 3 &mpic 2 1
+                       08800 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x12 (Slot 1) */
+                       09000 0 0 1 &mpic 0 1
+                       09000 0 0 2 &mpic 1 1
+                       09000 0 0 3 &mpic 2 1
+                       09000 0 0 4 &mpic 3 1
+
+                       /* IDSEL 0x13 (Slot 2) */
+                       09800 0 0 1 &mpic 1 1
+                       09800 0 0 2 &mpic 2 1
+                       09800 0 0 3 &mpic 3 1
+                       09800 0 0 4 &mpic 0 1
+
+                       /* IDSEL 0x14 (Slot 3) */
+                       0a000 0 0 1 &mpic 2 1
+                       0a000 0 0 2 &mpic 3 1
+                       0a000 0 0 3 &mpic 0 1
+                       0a000 0 0 4 &mpic 1 1
+
+                       /* IDSEL 0x15 (Slot 4) */
+                       0a800 0 0 1 &mpic 3 1
+                       0a800 0 0 2 &mpic 0 1
+                       0a800 0 0 3 &mpic 1 1
+                       0a800 0 0 4 &mpic 2 1
+
+                       /* Bus 1 (Tundra Bridge) */
+                       /* IDSEL 0x12 (ISA bridge) */
+                       19000 0 0 1 &mpic 0 1
+                       19000 0 0 2 &mpic 1 1
+                       19000 0 0 3 &mpic 2 1
+                       19000 0 0 4 &mpic 3 1>;
+               interrupt-parent = <&mpic>;
+               interrupts = <18 2>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 80000000 80000000 0 20000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0008000 1000>;
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+
+               i8259@19000 {
+                       interrupt-controller;
+                       device_type = "interrupt-controller";
+                       reg = <19000 0 0 0 1>;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       compatible = "chrp,iic";
+                       interrupts = <1>;
+                       interrupt-parent = <&pci1>;
+               };
+       };
+
+       pci@e0009000 {
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+
+                       /* IDSEL 0x15 */
+                       a800 0 0 1 &mpic b 1
+                       a800 0 0 2 &mpic b 1
+                       a800 0 0 3 &mpic b 1
+                       a800 0 0 4 &mpic b 1>;
+               interrupt-parent = <&mpic>;
+               interrupts = <19 2>;
+               bus-range = <0 0>;
+               ranges = <02000000 0 a0000000 a0000000 0 20000000
+                         01000000 0 00000000 e3000000 0 00100000>;
+               clock-frequency = <3f940aa>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <e0009000 1000>;
+               compatible = "fsl,mpc8540-pci";
+               device_type = "pci";
+       };
 };
index cf87c30cf6a868a085b96078edaf39484fa777ce..5577ec1f312b22386b952470294f95a6bc1e6f4b 100644 (file)
                        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>;
                        };
                };
        };
+
+       pci@e0008000 {
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+               device_type = "pci";
+               reg = <e0008000 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>;
+       };
 };
index 4d53d9bc3a9d2342cb78addb83a25e22951b22f8..f797662212bad545c05d448c22eb34e33192d2fb 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
-               ranges = <00001000 f8001000 000ff000
-                         80000000 80000000 20000000
-                         e2000000 e2000000 00100000
-                         a0000000 a0000000 20000000
-                         e3000000 e3000000 00100000>;
+               ranges = <00000000 f8000000 00100000>;
                reg = <f8000000 00001000>;      // CCSRBAR
                bus-frequency = <0>;
 
                        interrupt-parent = <&mpic>;
                };
 
-               pcie@8000 {
-                       compatible = "fsl,mpc8641-pcie";
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8000 1000>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 80000000 80000000 0 20000000
-                                 01000000 0 00000000 e2000000 0 00100000>;
-                       clock-frequency = <1fca055>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <18 2>;
-                       interrupt-map-mask = <fb00 0 0 0>;
-                       interrupt-map = <
-                               /* IDSEL 0x11 */
-                               8800 0 0 1 &i8259 9 2
-                               8800 0 0 2 &i8259 a 2
-                               8800 0 0 3 &i8259 b 2
-                               8800 0 0 4 &i8259 c 2
+               mpic: pic@40000 {
+                       clock-frequency = <0>;
+                       interrupt-controller;
+                       #address-cells = <0>;
+                       #interrupt-cells = <2>;
+                       reg = <40000 40000>;
+                       compatible = "chrp,open-pic";
+                       device_type = "open-pic";
+                       big-endian;
+               };
+       };
 
-                               /* IDSEL 0x12 */
-                               9000 0 0 1 &i8259 a 2
-                               9000 0 0 2 &i8259 b 2
-                               9000 0 0 3 &i8259 c 2
-                               9000 0 0 4 &i8259 9 2
+       pcie@f8008000 {
+               compatible = "fsl,mpc8641-pcie";
+               device_type = "pci";
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <f8008000 1000>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 80000000 80000000 0 20000000
+                         01000000 0 00000000 e2000000 0 00100000>;
+               clock-frequency = <1fca055>;
+               interrupt-parent = <&mpic>;
+               interrupts = <18 2>;
+               interrupt-map-mask = <fb00 0 0 0>;
+               interrupt-map = <
+                       /* IDSEL 0x11 */
+                       8800 0 0 1 &i8259 9 2
+                       8800 0 0 2 &i8259 a 2
+                       8800 0 0 3 &i8259 b 2
+                       8800 0 0 4 &i8259 c 2
 
-                               // IDSEL 0x1c  USB
-                               e000 0 0 0 &i8259 c 2
-                               e100 0 0 0 &i8259 9 2
-                               e200 0 0 0 &i8259 a 2
-                               e300 0 0 0 &i8259 b 2
+                       /* IDSEL 0x12 */
+                       9000 0 0 1 &i8259 a 2
+                       9000 0 0 2 &i8259 b 2
+                       9000 0 0 3 &i8259 c 2
+                       9000 0 0 4 &i8259 9 2
 
-                               // IDSEL 0x1d  Audio
-                               e800 0 0 0 &i8259 6 2
+                       // IDSEL 0x1c  USB
+                       e000 0 0 0 &i8259 c 2
+                       e100 0 0 0 &i8259 9 2
+                       e200 0 0 0 &i8259 a 2
+                       e300 0 0 0 &i8259 b 2
 
-                               // IDSEL 0x1e Legacy
-                               f000 0 0 0 &i8259 7 2
-                               f100 0 0 0 &i8259 7 2
+                       // IDSEL 0x1d  Audio
+                       e800 0 0 0 &i8259 6 2
 
-                               // IDSEL 0x1f IDE/SATA
-                               f800 0 0 0 &i8259 e 2
-                               f900 0 0 0 &i8259 5 2
-                               >;
+                       // IDSEL 0x1e Legacy
+                       f000 0 0 0 &i8259 7 2
+                       f100 0 0 0 &i8259 7 2
+
+                       // IDSEL 0x1f IDE/SATA
+                       f800 0 0 0 &i8259 e 2
+                       f900 0 0 0 &i8259 5 2
+                       >;
+
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       device_type = "pci";
+                       ranges = <02000000 0 80000000
+                                 02000000 0 80000000
+                                 0 20000000
+
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00100000>;
                        uli1575@0 {
                                reg = <0 0 0 0 0>;
                                #size-cells = <2>;
                                          01000000 0 00000000
                                          01000000 0 00000000
                                          0 00100000>;
+                               isa@1e {
+                                       device_type = "isa";
+                                       #interrupt-cells = <2>;
+                                       #size-cells = <1>;
+                                       #address-cells = <2>;
+                                       reg = <f000 0 0 0 0>;
+                                       ranges = <1 0 01000000 0 0
+                                                 00001000>;
+                                       interrupt-parent = <&i8259>;
 
-                               pci_bridge@0 {
-                                       reg = <0 0 0 0 0>;
-                                       #size-cells = <2>;
-                                       #address-cells = <3>;
-                                       ranges = <02000000 0 80000000
-                                                 02000000 0 80000000
-                                                 0 20000000
-                                                 01000000 0 00000000
-                                                 01000000 0 00000000
-                                                 0 00100000>;
-
-                                       isa@1e {
-                                               device_type = "isa";
+                                       i8259: interrupt-controller@20 {
+                                               reg = <1 20 2
+                                                      1 a0 2
+                                                      1 4d0 2>;
+                                               interrupt-controller;
+                                               device_type = "interrupt-controller";
+                                               #address-cells = <0>;
                                                #interrupt-cells = <2>;
-                                               #size-cells = <1>;
-                                               #address-cells = <2>;
-                                               reg = <f000 0 0 0 0>;
-                                               ranges = <1 0 01000000 0 0
-                                                         00001000>;
-                                               interrupt-parent = <&i8259>;
-
-                                               i8259: interrupt-controller@20 {
-                                                       reg = <1 20 2
-                                                              1 a0 2
-                                                              1 4d0 2>;
-                                                       interrupt-controller;
-                                                       device_type = "interrupt-controller";
-                                                       #address-cells = <0>;
-                                                       #interrupt-cells = <2>;
-                                                       compatible = "chrp,iic";
-                                                       interrupts = <9 2>;
-                                                       interrupt-parent =
-                                                               <&mpic>;
-                                               };
-
-                                               i8042@60 {
-                                                       #size-cells = <0>;
-                                                       #address-cells = <1>;
-                                                       reg = <1 60 1 1 64 1>;
-                                                       interrupts = <1 3 c 3>;
-                                                       interrupt-parent =
-                                                               <&i8259>;
+                                               compatible = "chrp,iic";
+                                               interrupts = <9 2>;
+                                               interrupt-parent = <&mpic>;
+                                       };
 
-                                                       keyboard@0 {
-                                                               reg = <0>;
-                                                               compatible = "pnpPNP,303";
-                                                       };
+                                       i8042@60 {
+                                               #size-cells = <0>;
+                                               #address-cells = <1>;
+                                               reg = <1 60 1 1 64 1>;
+                                               interrupts = <1 3 c 3>;
+                                               interrupt-parent =
+                                                       <&i8259>;
 
-                                                       mouse@1 {
-                                                               reg = <1>;
-                                                               compatible = "pnpPNP,f03";
-                                                       };
+                                               keyboard@0 {
+                                                       reg = <0>;
+                                                       compatible = "pnpPNP,303";
                                                };
 
-                                               rtc@70 {
-                                                       compatible =
-                                                               "pnpPNP,b00";
-                                                       reg = <1 70 2>;
+                                               mouse@1 {
+                                                       reg = <1>;
+                                                       compatible = "pnpPNP,f03";
                                                };
+                                       };
 
-                                               gpio@400 {
-                                                       reg = <1 400 80>;
-                                               };
+                                       rtc@70 {
+                                               compatible =
+                                                       "pnpPNP,b00";
+                                               reg = <1 70 2>;
+                                       };
+
+                                       gpio@400 {
+                                               reg = <1 400 80>;
                                        };
                                };
                        };
-
                };
 
-               pcie@9000 {
-                       compatible = "fsl,mpc8641-pcie";
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
+       };
+
+       pcie@f8009000 {
+               compatible = "fsl,mpc8641-pcie";
+               device_type = "pci";
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <f8009000 1000>;
+               bus-range = <0 ff>;
+               ranges = <02000000 0 a0000000 a0000000 0 20000000
+                         01000000 0 00000000 e3000000 0 00100000>;
+               clock-frequency = <1fca055>;
+               interrupt-parent = <&mpic>;
+               interrupts = <19 2>;
+               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map = <
+                       /* IDSEL 0x0 */
+                       0000 0 0 1 &mpic 4 1
+                       0000 0 0 2 &mpic 5 1
+                       0000 0 0 3 &mpic 6 1
+                       0000 0 0 4 &mpic 7 1
+                       >;
+               pcie@0 {
+                       reg = <0 0 0 0 0>;
                        #size-cells = <2>;
                        #address-cells = <3>;
-                       reg = <9000 1000>;
-                       bus-range = <0 ff>;
-                       ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                 01000000 0 00000000 e3000000 0 00100000>;
-                       clock-frequency = <1fca055>;
-                       interrupt-parent = <&mpic>;
-                       interrupts = <19 2>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                               /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 4 1
-                               0000 0 0 2 &mpic 5 1
-                               0000 0 0 3 &mpic 6 1
-                               0000 0 0 4 &mpic 7 1
-                               >;
-               };
+                       device_type = "pci";
+                       ranges = <02000000 0 a0000000
+                                 02000000 0 a0000000
+                                 0 20000000
 
-               mpic: pic@40000 {
-                       clock-frequency = <0>;
-                       interrupt-controller;
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       reg = <40000 40000>;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-                       big-endian;
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 00100000>;
                };
        };
 };