Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git] / arch / powerpc / boot / dts / sequoia.dts
index 675026b..72d15f0 100644 (file)
  *
  */
 
+/dts-v1/;
+
 / {
        #address-cells = <2>;
        #size-cells = <1>;
        model = "amcc,sequoia";
        compatible = "amcc,sequoia";
-       dcr-parent = <&/cpus/cpu@0>;
+       dcr-parent = <&{/cpus/cpu@0}>;
 
        aliases {
                ethernet0 = &EMAC0;
                cpu@0 {
                        device_type = "cpu";
                        model = "PowerPC,440EPx";
-                       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-440epx","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-440epx","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-440epx","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 = <1c 4 1d 4>; /* cascade */
+               interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                interrupt-parent = <&UIC0>;
        };
 
        SDR0: sdr {
                compatible = "ibm,sdr-440epx", "ibm,sdr-440ep";
-               dcr-reg = <00e 002>;
+               dcr-reg = <0x00e 0x002>;
        };
 
        CPR0: cpr {
                compatible = "ibm,cpr-440epx", "ibm,cpr-440ep";
-               dcr-reg = <00c 002>;
+               dcr-reg = <0x00c 0x002>;
        };
 
        plb {
 
                SDRAM0: sdram {
                        compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
-                       dcr-reg = <010 2>;
+                       dcr-reg = <0x010 0x002>;
                };
 
                DMA0: dma {
                        compatible = "ibm,dma-440epx", "ibm,dma-4xx";
-                       dcr-reg = <100 027>;
+                       dcr-reg = <0x100 0x027>;
                };
 
                MAL0: mcmal {
                        compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
-                       dcr-reg = <180 62>;
+                       dcr-reg = <0x180 0x062>;
                        num-tx-chans = <2>;
                        num-rx-chans = <2>;
                        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 &UIC0 a 4
-                                       /*RXEOB*/ 1 &UIC0 b 4
-                                       /*SERR*/  2 &UIC1 0 4
-                                       /*TXDE*/  3 &UIC1 1 4
-                                       /*RXDE*/  4 &UIC1 2 4>;
-                       interrupt-map-mask = <ffffffff>;
+                       interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                       /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                       /*SERR*/  0x2 &UIC1 0x0 0x4
+                                       /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                       /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                       interrupt-map-mask = <0xffffffff>;
                };
 
                USB1: usb@e0000400 {
                        compatible = "ohci-be";
-                       reg = <0 e0000400 60>;
+                       reg = <0x00000000 0xe0000400 0x00000060>;
                        interrupt-parent = <&UIC0>;
-                       interrupts = <15 8>;
+                       interrupts = <0x15 0x8>;
                };
 
                USB0: ehci@e0000300 {
                        compatible = "ibm,usb-ehci-440epx", "usb-ehci";
                        interrupt-parent = <&UIC0>;
-                       interrupts = <1a 4>;
-                       reg = <0 e0000300 90 0 e0000390 70>;
+                       interrupts = <0x1a 0x4>;
+                       reg = <0x00000000 0xe0000300 0x00000090 0x00000000 0xe0000390 0x00000070>;
                        big-endian;
                };
 
                        compatible = "ibm,opb-440epx", "ibm,opb";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges = <00000000 1 00000000 80000000
-                                 80000000 1 80000000 80000000>;
+                       ranges = <0x00000000 0x00000001 0x00000000 0x80000000
+                                 0x80000000 0x00000001 0x80000000 0x80000000>;
                        interrupt-parent = <&UIC1>;
-                       interrupts = <4>;
+                       interrupts = <0x7 0x4>;
                        clock-frequency = <0>; /* Filled in by zImage */
 
                        EBC0: ebc {
                                compatible = "ibm,ebc-440epx", "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>;
 
                                nor_flash@0,0 {
                                        compatible = "amd,s29gl256n", "cfi-flash";
                                        bank-width = <2>;
-                                       reg = <0 000000 4000000>;
+                                       reg = <0x00000000 0x00000000 0x04000000>;
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        partition@0 {
                                                label = "Kernel";
-                                               reg = <0 180000>;
+                                               reg = <0x00000000 0x00180000>;
                                        };
                                        partition@180000 {
                                                label = "ramdisk";
-                                               reg = <180000 200000>;
+                                               reg = <0x00180000 0x00200000>;
                                        };
                                        partition@380000 {
                                                label = "file system";
-                                               reg = <380000 3aa0000>;
+                                               reg = <0x00380000 0x03aa0000>;
                                        };
                                        partition@3e20000 {
                                                label = "kozio";
-                                               reg = <3e20000 140000>;
+                                               reg = <0x03e20000 0x00140000>;
                                        };
                                        partition@3f60000 {
                                                label = "env";
-                                               reg = <3f60000 40000>;
+                                               reg = <0x03f60000 0x00040000>;
                                        };
                                        partition@3fa0000 {
                                                label = "u-boot";
-                                               reg = <3fa0000 60000>;
+                                               reg = <0x03fa0000 0x00060000>;
                                        };
                                };
 
                        UART0: serial@ef600300 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <ef600300 8>;
-                               virtual-reg = <ef600300>;
+                               reg = <0xef600300 0x00000008>;
+                               virtual-reg = <0xef600300>;
                                clock-frequency = <0>; /* Filled in by zImage */
-                               current-speed = <1c200>;
+                               current-speed = <115200>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <0 4>;
+                               interrupts = <0x0 0x4>;
                        };
 
                        UART1: serial@ef600400 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <ef600400 8>;
-                               virtual-reg = <ef600400>;
+                               reg = <0xef600400 0x00000008>;
+                               virtual-reg = <0xef600400>;
                                clock-frequency = <0>;
                                current-speed = <0>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x1 0x4>;
                        };
 
                        UART2: serial@ef600500 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <ef600500 8>;
-                               virtual-reg = <ef600500>;
+                               reg = <0xef600500 0x00000008>;
+                               virtual-reg = <0xef600500>;
                                clock-frequency = <0>;
                                current-speed = <0>;
                                interrupt-parent = <&UIC1>;
-                               interrupts = <4>;
+                               interrupts = <0x3 0x4>;
                        };
 
                        UART3: serial@ef600600 {
                                device_type = "serial";
                                compatible = "ns16550";
-                               reg = <ef600600 8>;
-                               virtual-reg = <ef600600>;
+                               reg = <0xef600600 0x00000008>;
+                               virtual-reg = <0xef600600>;
                                clock-frequency = <0>;
                                current-speed = <0>;
                                interrupt-parent = <&UIC1>;
-                               interrupts = <4>;
+                               interrupts = <0x4 0x4>;
                        };
 
                        IIC0: i2c@ef600700 {
                                compatible = "ibm,iic-440epx", "ibm,iic";
-                               reg = <ef600700 14>;
+                               reg = <0xef600700 0x00000014>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x2 0x4>;
                        };
 
                        IIC1: i2c@ef600800 {
                                compatible = "ibm,iic-440epx", "ibm,iic";
-                               reg = <ef600800 14>;
+                               reg = <0xef600800 0x00000014>;
                                interrupt-parent = <&UIC0>;
-                               interrupts = <4>;
+                               interrupts = <0x7 0x4>;
                        };
 
                        ZMII0: emac-zmii@ef600d00 {
                                compatible = "ibm,zmii-440epx", "ibm,zmii";
-                               reg = <ef600d00 c>;
+                               reg = <0xef600d00 0x0000000c>;
                        };
 
                        RGMII0: emac-rgmii@ef601000 {
                                compatible = "ibm,rgmii-440epx", "ibm,rgmii";
-                               reg = <ef601000 8>;
+                               reg = <0xef601000 0x00000008>;
                                has-mdio;
                        };
 
                                device_type = "network";
                                compatible = "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC0>;
-                               interrupts = <0 1>;
+                               interrupts = <0x0 0x1>;
                                #interrupt-cells = <1>;
                                #address-cells = <0>;
                                #size-cells = <0>;
-                               interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                               /*Wake*/  1 &UIC1 1d 4>;
-                               reg = <ef600e00 70>;
+                               interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                               /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                               reg = <0xef600e00 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 = "rgmii";
-                               phy-map = <00000000>;
+                               phy-map = <0x00000000>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <0>;
                                rgmii-device = <&RGMII0>;
                                device_type = "network";
                                compatible = "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC1>;
-                               interrupts = <0 1>;
+                               interrupts = <0x0 0x1>;
                                #interrupt-cells = <1>;
                                #address-cells = <0>;
                                #size-cells = <0>;
-                               interrupt-map = </*Status*/ 0 &UIC0 19 4
-                                               /*Wake*/  1 &UIC1 1f 4>;
-                               reg = <ef600f00 70>;
+                               interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
+                                               /*Wake*/  0x1 &UIC1 0x1f 0x4>;
+                               reg = <0xef600f00 0x00000074>;
                                local-mac-address = [000000000000];
                                mal-device = <&MAL0>;
                                mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
-                               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 = "rgmii";
-                               phy-map = <00000000>;
+                               phy-map = <0x00000000>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <1>;
                                rgmii-device = <&RGMII0>;
                        #address-cells = <3>;
                        compatible = "ibm,plb440epx-pci", "ibm,plb-pci";
                        primary;
-                       reg = <1 eec00000 8     /* Config space access */
-                              1 eed00000 4     /* IACK */
-                              1 eed00000 4     /* Special cycle */
-                              1 ef400000 40>;  /* Internal registers */
+                       reg = <0x00000001 0xeec00000 0x00000008 /* Config space access */
+                              0x00000001 0xeed00000 0x00000004 /* IACK */
+                              0x00000001 0xeed00000 0x00000004 /* Special cycle */
+                              0x00000001 0xef400000 0x00000040>;       /* Internal registers */
 
                        /* Outbound ranges, one memory and one IO,
                         * later cannot be changed. Chip supports a second
                         * IO range but we don't use it for now
+                        * From the 440EPx user manual:
+                        * PCI 1 Memory     1 8000 0000     1 BFFF FFFF     1GB
+                        * I/O              1 E800 0000     1 E800 FFFF     64KB
+                        * I/O              1 E880 0000     1 EBFF FFFF     56MB
                         */
-                       ranges = <02000000 0 80000000 1 80000000 0 10000000
-                               01000000 0 00000000 1 e8000000 0 00100000>;
+                       ranges = <0x02000000 0x00000000 0x80000000 0x00000001 0x80000000 0x00000000 0x40000000
+                               0x01000000 0x00000000 0x00000000 0x00000001 0xe8000000 0x00000000 0x00010000
+                               0x01000000 0x00000000 0x00000000 0x00000001 0xe8800000 0x00000000 0x03800000>;
 
                        /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                        /* All PCI interrupts are routed to IRQ 67 */
-                       interrupt-map-mask = <0000 0 0 0>;
-                       interrupt-map = < 0000 0 0 0 &UIC2 3 8 >;
+                       interrupt-map-mask = <0x0 0x0 0x0 0x0>;
+                       interrupt-map = < 0x0 0x0 0x0 0x0 &UIC2 0x3 0x8 >;
                };
        };