Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / powerpc / boot / dts / ebony.dts

diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index b679186..bc25997 100644 (file)
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -9,10 +9,6 @@
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without
  * any warranty of any kind, whether express or implied.
- *
- * To build:
- *   dtc -I dts -O asm -o ebony.S -b 0 ebony.dts
- *   dtc -I dts -O dtb -o ebony.dtb -b 0 ebony.dts
  */
 
 / {
@@ -31,10 +27,10 @@
                        reg = <0>;
                        clock-frequency = <0>; // Filled in by zImage
                        timebase-frequency = <0>; // Filled in by zImage
-                       i-cache-line-size = <32>;
-                       d-cache-line-size = <32>;
-                       i-cache-size = <0>;
-                       d-cache-size = <0>;
+                       i-cache-line-size = <20>;
+                       d-cache-line-size = <20>;
+                       i-cache-size = <8000>; /* 32 kB */
+                       d-cache-size = <8000>; /* 32 kB */
                        dcr-controller;
                        dcr-access-method = "native";
                };
@@ -46,7 +42,6 @@
        };
 
        UIC0: interrupt-controller0 {
-               device_type = "ibm,uic";
                compatible = "ibm,uic-440gp", "ibm,uic";
                interrupt-controller;
                cell-index = <0>;
@@ -58,7 +53,6 @@
        };
 
        UIC1: interrupt-controller1 {
-               device_type = "ibm,uic";
                compatible = "ibm,uic-440gp", "ibm,uic";
                interrupt-controller;
                cell-index = <1>;
@@ -71,36 +65,36 @@
        };
 
        CPC0: cpc {
-               device_type = "ibm,cpc";
                compatible = "ibm,cpc-440gp";
                dcr-reg = <0b0 003 0e0 010>;
                // FIXME: anything else?
        };
 
        plb {
-               device_type = "ibm,plb";
                compatible = "ibm,plb-440gp", "ibm,plb4";
                #address-cells = <2>;
                #size-cells = <1>;
                ranges;
                clock-frequency = <0>; // Filled in by zImage
 
-               SDRAM0: sdram {
-                       device_type = "memory-controller";
-                       compatible = "ibm,sdram-440gp", "ibm,sdram";
+               SDRAM0: memory-controller {
+                       compatible = "ibm,sdram-440gp";
                        dcr-reg = <010 2>;
                        // FIXME: anything else?
                };
 
+               SRAM0: sram {
+                       compatible = "ibm,sram-440gp";
+                       dcr-reg = <020 8 00a 1>;
+               };
+
                DMA0: dma {
                        // FIXME: ???
-                       device_type = "ibm,dma-4xx";
-                       compatible = "ibm,dma-440gp", "ibm,dma-4xx";
+                       compatible = "ibm,dma-440gp";
                        dcr-reg = <100 027>;
                };
 
                MAL0: mcmal {
-                       device_type = "mcmal-dma";
                        compatible = "ibm,mcmal-440gp", "ibm,mcmal";
                        dcr-reg = <180 62>;
                        num-tx-chans = <4>;
@@ -119,7 +113,6 @@
                };
 
                POB0: opb {
-                       device_type = "ibm,opb";
                        compatible = "ibm,opb-440gp", "ibm,opb";
                        #address-cells = <1>;
                        #size-cells = <1>;
@@ -133,46 +126,50 @@
                        clock-frequency = <0>; // Filled in by zImage
 
                        EBC0: ebc {
-                               device_type = "ibm,ebc";
-                               compatible = "ibm,ebc-440gp";
+                               compatible = "ibm,ebc-440gp", "ibm,ebc";
                                dcr-reg = <012 2>;
                                #address-cells = <2>;
                                #size-cells = <1>;
                                clock-frequency = <0>; // Filled in by zImage
-                               ranges = <0 00000000 fff00000 100000
-                                         1 00000000 48000000 100000
-                                         2 00000000 ff800000 400000
-                                         3 00000000 48200000 100000
-                                         7 00000000 48300000 100000>;
+                               // ranges property is supplied by zImage
+                               // based on firmware's configuration of the
+                               // EBC bridge
                                interrupts = <5 4>;
                                interrupt-parent = <&UIC1>;
 
-                               small-flash@0,0 {
-                                       device_type = "rom";
-                                       compatible = "direct-mapped";
-                                       probe-type = "JEDEC";
+                               small-flash@0,80000 {
+                                       compatible = "jedec-flash";
                                        bank-width = <1>;
-                                       partitions = <0 80000>;
-                                       partition-names = "OpenBIOS";
                                        reg = <0 80000 80000>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       partition@0 {
+                                               label = "OpenBIOS";
+                                               reg = <0 80000>;
+                                               read-only;
+                                       };
                                };
 
                                ds1743@1,0 {
                                        /* NVRAM & RTC */
-                                       device_type = "nvram";
                                        compatible = "ds1743";
                                        reg = <1 0 2000>;
                                };
 
                                large-flash@2,0 {
-                                       device_type = "rom";
-                                       compatible = "direct-mapped";
-                                       probe-type = "JEDEC";
+                                       compatible = "jedec-flash";
                                        bank-width = <1>;
-                                       partitions = <0 380000
-                                                     280000 80000>;
-                                       partition-names = "fs", "firmware";
                                        reg = <2 0 400000>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       partition@0 {
+                                               label = "fs";
+                                               reg = <0 380000>;
+                                       };
+                                       partition@380000 {
+                                               label = "firmware";
+                                               reg = <380000 80000>;
+                                       };
                                };
 
                                ir@3,0 {
@@ -182,6 +179,7 @@
                                fpga@7,0 {
                                        compatible = "Ebony-FPGA";
                                        reg = <7 0 10>;
+                                       virtual-reg = <e8300000>;
                                };
                        };
 
@@ -226,13 +224,11 @@
 
                        GPIO0: gpio@40000700 {
                                /* FIXME */
-                               device_type = "gpio";
                                compatible = "ibm,gpio-440gp";
                                reg = <40000700 20>;
                        };
 
                        ZMII0: emac-zmii@40000780 {
-                               device_type = "emac-zmii";
                                compatible = "ibm,zmii-440gp", "ibm,zmii";
                                reg = <40000780 c>;
                        };
@@ -299,9 +295,5 @@
 
        chosen {
                linux,stdout-path = "/plb/opb/serial@40000200";
-//             linux,initrd-start = <0>; /* FIXME */
-//             linux,initrd-end = <0>;
-//             bootargs = "";
        };
 };
-