Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git] / arch / powerpc / boot / dts / katmai.dts
index fc86e5a..077819b 100644 (file)
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
        #address-cells = <2>;
        #size-cells = <1>;
        model = "amcc,katmai";
        compatible = "amcc,katmai";
-       dcr-parent = <&/cpus/cpu@0>;
+       dcr-parent = <&{/cpus/cpu@0}>;
 
        aliases {
                ethernet0 = &EMAC0;
                cpu@0 {
                        device_type = "cpu";
                        model = "PowerPC,440SPe";
-                       reg = <0>;
+                       reg = <0x00000000>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */
-                       i-cache-line-size = <20>;
-                       d-cache-line-size = <20>;
-                       i-cache-size = <8000>;
-                       d-cache-size = <8000>;
+                       i-cache-line-size = <32>;
+                       d-cache-line-size = <32>;
+                       i-cache-size = <32768>;
+                       d-cache-size = <32768>;
                        dcr-controller;
                        dcr-access-method = "native";
                };
 
        memory {
                device_type = "memory";
-               reg = <0 0 0>; /* Filled in by zImage */
+               reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
        };
 
        UIC0: interrupt-controller0 {
                compatible = "ibm,uic-440spe","ibm,uic";
                interrupt-controller;
                cell-index = <0>;
-               dcr-reg = <0c0 009>;
+               dcr-reg = <0x0c0 0x009>;
                #address-cells = <0>;
                #size-cells = <0>;
                #interrupt-cells = <2>;
                compatible = "ibm,uic-440spe","ibm,uic";
                interrupt-controller;
                cell-index = <1>;
-               dcr-reg = <0d0 009>;
+               dcr-reg = <0x0d0 0x009>;
                #address-cells = <0>;
                #size-cells = <0>;
                #interrupt-cells = <2>;
-               interrupts = <1e 4 1f 4>; /* cascade */
+               interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                interrupt-parent = <&UIC0>;
        };
 
                compatible = "ibm,uic-440spe","ibm,uic";
                interrupt-controller;
                cell-index = <2>;
-               dcr-reg = <0e0 009>;
+               dcr-reg = <0x0e0 0x009>;
                #address-cells = <0>;
                #size-cells = <0>;
                #interrupt-cells = <2>;
-               interrupts = <a 4 b 4>; /* cascade */
+               interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
                interrupt-parent = <&UIC0>;
        };
 
                compatible = "ibm,uic-440spe","ibm,uic";
                interrupt-controller;
                cell-index = <3>;
-               dcr-reg = <0f0 009>;
+               dcr-reg = <0x0f0 0x009>;
                #address-cells = <0>;
                #size-cells = <0>;
                #interrupt-cells = <2>;
-               interrupts = <10 4 11 4>; /* cascade */
+               interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
                interrupt-parent = <&UIC0>;
        };
 
        SDR0: sdr {
                compatible = "ibm,sdr-440spe";
-               dcr-reg = <00e 002>;
+               dcr-reg = <0x00e 0x002>;
        };
 
        CPR0: cpr {
                compatible = "ibm,cpr-440spe";
-               dcr-reg = <00c 002>;
+               dcr-reg = <0x00c 0x002>;
        };
 
        plb {
 
                SDRAM0: sdram {
                        compatible = "ibm,sdram-440spe", "ibm,sdram-405gp";
-                       dcr-reg = <010 2>;
+                       dcr-reg = <0x010 0x002>;
                };
 
                MAL0: mcmal {
                        compatible = "ibm,mcmal-440spe", "ibm,mcmal2";
-                       dcr-reg = <180 62>;
+                       dcr-reg = <0x180 0x062>;
                        num-tx-chans = <2>;
                        num-rx-chans = <1>;
                        interrupt-parent = <&MAL0>;
-                       interrupts = <0 1 2 3 4>;
+                       interrupts = <0x0 0x1 0x2 0x3 0x4>;
                        #interrupt-cells = <1>;
                        #address-cells = <0>;
                        #size-cells = <0>;
-                       interrupt-map = </*TXEOB*/ 0 &UIC1 6 4
-                                        /*RXEOB*/ 1 &UIC1 7 4
-                                        /*SERR*/  2 &UIC1 1 4
-                                        /*TXDE*/  3 &UIC1 2 4
-                                        /*RXDE*/  4 &UIC1 3 4>;
+                       interrupt-map = </*TXEOB*/ 0x0 &UIC1 0x6 0x4
+                                        /*RXEOB*/ 0x1 &UIC1 0x7 0x4
+                                        /*SERR*/  0x2 &UIC1 0x1 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x2 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x3 0x4>;
                };
 
                POB0: opb {
                        compatible = "ibm,opb-440spe", "ibm,opb-440gp", "ibm,opb";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges = <00000000 4 e0000000 20000000>;
+                       ranges = <0x00000000 0x00000004 0xe0000000 0x20000000>;
                        clock-frequency = <0>; /* Filled in by zImage */
 
                        EBC0: ebc {
                                compatible = "ibm,ebc-440spe", "ibm,ebc-440gp", "ibm,ebc";
-                               dcr-reg = <012 2>;
+                               dcr-reg = <0x012 0x002>;
                                #address-cells = <2>;
                                #size-cells = <1>;
                                clock-frequency = <0>; /* Filled in by zImage */
-                               interrupts = <1>;
+                               interrupts = <0x5 0x1>;
                                interrupt-parent = <&UIC1>;
                        };
 
                        UART0: serial@10000200 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <10000200 8>;
-                               virtual-reg = <a0000200>;
+                               reg = <0x10000200 0x00000008>;
+                               virtual-reg = <0xa0000200>;
                                clock-frequency = <0>; /* Filled in by zImage */
-                               current-speed = <1c200>;
+                               current-speed = <115200>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <0 4>;
+                               interrupts = <0x0 0x4>;
                        };
 
                        UART1: serial@10000300 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <10000300 8>;
-                               virtual-reg = <a0000300>;
+                               reg = <0x10000300 0x00000008>;
+                               virtual-reg = <0xa0000300>;
                                clock-frequency = <0>;
                                current-speed = <0>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x1 0x4>;
                        };
 
 
                        UART2: serial@10000600 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <10000600 8>;
-                               virtual-reg = <a0000600>;
+                               reg = <0x10000600 0x00000008>;
+                               virtual-reg = <0xa0000600>;
                                clock-frequency = <0>;
                                current-speed = <0>;
                                interrupt-parent = <&UIC1>;
-                               interrupts = <4>;
+                               interrupts = <0x5 0x4>;
                        };
 
                        IIC0: i2c@10000400 {
                                compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
-                               reg = <10000400 14>;
+                               reg = <0x10000400 0x00000014>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x2 0x4>;
                        };
 
                        IIC1: i2c@10000500 {
                                compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
-                               reg = <10000500 14>;
+                               reg = <0x10000500 0x00000014>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x3 0x4>;
                        };
 
                        EMAC0: ethernet@10000800 {
-                               linux,network-index = <0>;
+                               linux,network-index = <0x0>;
                                device_type = "network";
                                compatible = "ibm,emac-440spe", "ibm,emac4";
                                interrupt-parent = <&UIC1>;
-                               interrupts = <1c 4 1d 4>;
-                               reg = <10000800 70>;
+                               interrupts = <0x1c 0x4 0x1d 0x4>;
+                               reg = <0x10000800 0x00000074>;
                                local-mac-address = [000000000000];
                                mal-device = <&MAL0>;
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                               max-frame-size = <5dc>;
-                               rx-fifo-size = <1000>;
-                               tx-fifo-size = <800>;
+                               max-frame-size = <9000>;
+                               rx-fifo-size = <4096>;
+                               tx-fifo-size = <2048>;
                                phy-mode = "gmii";
-                               phy-map = <00000000>;
+                               phy-map = <0x00000000>;
                                has-inverted-stacr-oc;
                                has-new-stacr-staopc;
                        };
                        primary;
                        large-inbound-windows;
                        enable-msi-hole;
-                       reg = <c 0ec00000   8   /* Config space access */
-                              0 0 0            /* no IACK cycles */
-                              c 0ed00000   4   /* Special cycles */
-                              c 0ec80000 100   /* Internal registers */
-                              c 0ec80100  fc>; /* Internal messaging registers */
+                       reg = <0x0000000c 0x0ec00000   0x00000008       /* Config space access */
+                              0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                              0x0000000c 0x0ed00000   0x00000004   /* Special cycles */
+                              0x0000000c 0x0ec80000 0x00000100 /* Internal registers */
+                              0x0000000c 0x0ec80100  0x000000fc>;      /* Internal messaging registers */
 
                        /* Outbound ranges, one memory and one IO,
                         * later cannot be changed
                         */
-                       ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-                                 01000000 0 00000000 0000000c 08000000 0 00010000>;
+                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
+                                 0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
 
                        /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                        /* This drives busses 0 to 0xf */
-                       bus-range = <0 f>;
+                       bus-range = <0x0 0xf>;
 
                        /*
                         * On Katmai, the following PCI-X interrupts signals
                         * INTC: J2: 1-2
                         * INTD: J1: 1-2
                         */
-                       interrupt-map-mask = <f800 0 0 7>;
+                       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                        interrupt-map = <
                                /* IDSEL 1 */
-                               0800 0 0 1 &UIC1 14 8
-                               0800 0 0 2 &UIC1 13 8
-                               0800 0 0 3 &UIC1 12 8
-                               0800 0 0 4 &UIC1 11 8
+                               0x800 0x0 0x0 0x1 &UIC1 0x14 0x8
+                               0x800 0x0 0x0 0x2 &UIC1 0x13 0x8
+                               0x800 0x0 0x0 0x3 &UIC1 0x12 0x8
+                               0x800 0x0 0x0 0x4 &UIC1 0x11 0x8
                        >;
                };
 
                        #address-cells = <3>;
                        compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                        primary;
-                       port = <0>; /* port number */
-                       reg = <d 00000000 20000000      /* Config space access */
-                              c 10000000 00001000>;    /* Registers */
-                       dcr-reg = <100 020>;
-                       sdr-base = <300>;
+                       port = <0x0>; /* port number */
+                       reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */
+                              0x0000000c 0x10000000 0x00001000>;       /* Registers */
+                       dcr-reg = <0x100 0x020>;
+                       sdr-base = <0x300>;
 
                        /* Outbound ranges, one memory and one IO,
                         * later cannot be changed
                         */
-                       ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-                                 01000000 0 00000000 0000000f 80000000 0 00010000>;
+                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
+                                 0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
 
                        /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                        /* This drives busses 10 to 0x1f */
-                       bus-range = <10 1f>;
+                       bus-range = <0x10 0x1f>;
 
                        /* Legacy interrupts (note the weird polarity, the bridge seems
                         * to invert PCIe legacy interrupts).
                         * below are basically de-swizzled numbers.
                         * The real slot is on idsel 0, so the swizzling is 1:1
                         */
-                       interrupt-map-mask = <0000 0 0 7>;
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                        interrupt-map = <
-                               0000 0 0 1 &UIC3 0 4 /* swizzled int A */
-                               0000 0 0 2 &UIC3 1 4 /* swizzled int B */
-                               0000 0 0 3 &UIC3 2 4 /* swizzled int C */
-                               0000 0 0 4 &UIC3 3 4 /* swizzled int D */>;
+                               0x0 0x0 0x0 0x1 &UIC3 0x0 0x4 /* swizzled int A */
+                               0x0 0x0 0x0 0x2 &UIC3 0x1 0x4 /* swizzled int B */
+                               0x0 0x0 0x0 0x3 &UIC3 0x2 0x4 /* swizzled int C */
+                               0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
                };
 
                PCIE1: pciex@d20000000 {
                        #address-cells = <3>;
                        compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                        primary;
-                       port = <1>; /* port number */
-                       reg = <d 20000000 20000000      /* Config space access */
-                              c 10001000 00001000>;    /* Registers */
-                       dcr-reg = <120 020>;
-                       sdr-base = <340>;
+                       port = <0x1>; /* port number */
+                       reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */
+                              0x0000000c 0x10001000 0x00001000>;       /* Registers */
+                       dcr-reg = <0x120 0x020>;
+                       sdr-base = <0x340>;
 
                        /* Outbound ranges, one memory and one IO,
                         * later cannot be changed
                         */
-                       ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-                                 01000000 0 00000000 0000000f 80010000 0 00010000>;
+                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
+                                 0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
 
                        /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                        /* This drives busses 10 to 0x1f */
-                       bus-range = <20 2f>;
+                       bus-range = <0x20 0x2f>;
 
                        /* Legacy interrupts (note the weird polarity, the bridge seems
                         * to invert PCIe legacy interrupts).
                         * below are basically de-swizzled numbers.
                         * The real slot is on idsel 0, so the swizzling is 1:1
                         */
-                       interrupt-map-mask = <0000 0 0 7>;
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                        interrupt-map = <
-                               0000 0 0 1 &UIC3 4 4 /* swizzled int A */
-                               0000 0 0 2 &UIC3 5 4 /* swizzled int B */
-                               0000 0 0 3 &UIC3 6 4 /* swizzled int C */
-                               0000 0 0 4 &UIC3 7 4 /* swizzled int D */>;
+                               0x0 0x0 0x0 0x1 &UIC3 0x4 0x4 /* swizzled int A */
+                               0x0 0x0 0x0 0x2 &UIC3 0x5 0x4 /* swizzled int B */
+                               0x0 0x0 0x0 0x3 &UIC3 0x6 0x4 /* swizzled int C */
+                               0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
                };
 
                PCIE2: pciex@d40000000 {
                        #address-cells = <3>;
                        compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                        primary;
-                       port = <2>; /* port number */
-                       reg = <d 40000000 20000000      /* Config space access */
-                              c 10002000 00001000>;    /* Registers */
-                       dcr-reg = <140 020>;
-                       sdr-base = <370>;
+                       port = <0x2>; /* port number */
+                       reg = <0x0000000d 0x40000000 0x20000000 /* Config space access */
+                              0x0000000c 0x10002000 0x00001000>;       /* Registers */
+                       dcr-reg = <0x140 0x020>;
+                       sdr-base = <0x370>;
 
                        /* Outbound ranges, one memory and one IO,
                         * later cannot be changed
                         */
-                       ranges = <02000000 0 80000000 0000000f 00000000 0 80000000
-                                 01000000 0 00000000 0000000f 80020000 0 00010000>;
+                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000
+                                 0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>;
 
                        /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                        /* This drives busses 10 to 0x1f */
-                       bus-range = <30 3f>;
+                       bus-range = <0x30 0x3f>;
 
                        /* Legacy interrupts (note the weird polarity, the bridge seems
                         * to invert PCIe legacy interrupts).
                         * below are basically de-swizzled numbers.
                         * The real slot is on idsel 0, so the swizzling is 1:1
                         */
-                       interrupt-map-mask = <0000 0 0 7>;
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                        interrupt-map = <
-                               0000 0 0 1 &UIC3 8 4 /* swizzled int A */
-                               0000 0 0 2 &UIC3 9 4 /* swizzled int B */
-                               0000 0 0 3 &UIC3 a 4 /* swizzled int C */
-                               0000 0 0 4 &UIC3 b 4 /* swizzled int D */>;
+                               0x0 0x0 0x0 0x1 &UIC3 0x8 0x4 /* swizzled int A */
+                               0x0 0x0 0x0 0x2 &UIC3 0x9 0x4 /* swizzled int B */
+                               0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */
+                               0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                };
        };