Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git] / arch / powerpc / boot / dts / mpc8548cds.dts
index d215d21..69ca502 100644 (file)
@@ -30,7 +30,6 @@
                        timebase-frequency = <0>;       //  33 MHz, from uboot
                        bus-frequency = <0>;    // 166 MHz
                        clock-frequency = <0>;  // 825 MHz, from uboot
-                       32-bit;
                };
        };
 
        soc8548@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
-               ranges = <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 {
-                                               clock-frequency = <0>;
-                                               interrupt-controller;
-                                               device_type = "interrupt-controller";
-                                               reg = <1 20 2
-                                                      1 a0 2
-                                                      1 4d0 2>;
-                                               #address-cells = <0>;
-                                               #interrupt-cells = <2>;
-                                               built-in;
-                                               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>;
-                       built-in;
-                       compatible = "chrp,open-pic";
-                       device_type = "open-pic";
-                        big-endian;
+                                 01000000 0 00000000
+                                 01000000 0 00000000
+                                 0 08000000>;
                };
        };
 };