Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

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

diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index dcb7498..058438f 100644 (file)
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -186,7 +186,34 @@
                                interrupts = <0x5 0x4>;
                                interrupt-parent = <&UIC1>;
 
-                               /* TODO: Add other EBC devices */
+                               nor_flash@0,0 {
+                                       compatible = "cfi-flash";
+                                       bank-width = <4>;
+                                       device-width = <2>;
+                                       reg = <0x0 0x0 0x4000000>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       partition@0 {
+                                               label = "kernel";
+                                               reg = <0x0 0x180000>;
+                                       };
+                                       partition@180000 {
+                                               label = "root";
+                                               reg = <0x180000 0x200000>;
+                                       };
+                                       partition@380000 {
+                                               label = "user";
+                                               reg = <0x380000 0x3bc0000>;
+                                       };
+                                       partition@3f40000 {
+                                               label = "env";
+                                               reg = <0x3f40000 0x80000>;
+                                       };
+                                       partition@3fc0000 {
+                                               label = "u-boot";
+                                               reg = <0x3fc0000 0x40000>;
+                                       };
+                               };
                        };
 
 
@@ -260,7 +287,7 @@
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC1>;
                                interrupts = <0x1c 0x4 0x1d 0x4>;
-                               reg = <0x40000800 0x00000070>;
+                               reg = <0x40000800 0x00000074>;
                                local-mac-address = [000000000000]; // Filled in by zImage
                                mal-device = <&MAL0>;
                                mal-tx-channel = <0>;
@@ -280,7 +307,7 @@
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC1>;
                                interrupts = <0x1e 0x4 0x1f 0x4>;
-                               reg = <0x40000900 0x00000070>;
+                               reg = <0x40000900 0x00000074>;
                                local-mac-address = [000000000000]; // Filled in by zImage
                                mal-device = <&MAL0>;
                                mal-tx-channel = <1>;
@@ -300,7 +327,7 @@
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC2>;
                                interrupts = <0x0 0x4 0x1 0x4>;
-                               reg = <0x40000c00 0x00000070>;
+                               reg = <0x40000c00 0x00000074>;
                                local-mac-address = [000000000000]; // Filled in by zImage
                                mal-device = <&MAL0>;
                                mal-tx-channel = <2>;
@@ -324,7 +351,7 @@
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC2>;
                                interrupts = <0x2 0x4 0x3 0x4>;
-                               reg = <0x40000e00 0x00000070>;
+                               reg = <0x40000e00 0x00000074>;
                                local-mac-address = [000000000000]; // Filled in by zImage
                                mal-device = <&MAL0>;
                                mal-tx-channel = <3>;