Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge

4 files changed, 53 insertions, 8 deletions

diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index c63e3566479e..d13cb11ce623 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -293,4 +293,43 @@
                           0x02000000 0 0xa0000000 0xa0000000 0 0x10000000
                           0x01000000 0 0x00000000 0xb0000000 0 0x01000000>;
         };
+
+        localbus {
+                compatible = "fsl,mpc5200b-lpb","fsl,mpc5200-lpb","simple-bus";
+
+                #address-cells = <2>;
+                #size-cells = <1>;
+
+                ranges = <0 0 0xfe000000 0x02000000>;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x02000000>;
+                        bank-width = <1>;
+                        #size-cells = <1>;
+                        #address-cells = <1>;
+
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00200000>;
+                        };
+                        partition@200000 {
+                                label = "rootfs";
+                                reg = <0x00200000 0x01d00000>;
+                        };
+                        partition@1f00000 {
+                                label = "u-boot";
+                                reg = <0x01f00000 0x00060000>;
+                        };
+                        partition@1f60000 {
+                                label = "u-boot-env";
+                                reg = <0x01f60000 0x00020000>;
+                        };
+                        partition@1f80000 {
+                                label = "dtb";
+                                reg = <0x01f80000 0x00080000>;
+                        };
+                };
+        };
+
 };
diff --git a/arch/powerpc/boot/dts/socrates.dts b/arch/powerpc/boot/dts/socrates.dts
index 04c398862e03..7a6ae75a1e57 100644
--- a/arch/powerpc/boot/dts/socrates.dts
+++ b/arch/powerpc/boot/dts/socrates.dts
@@ -79,11 +79,11 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         cell-index = <0>;
-                        compatible = "fsl-i2c";
+                        compatible = "fsl,mpc8544-i2c", "fsl-i2c";
                         reg = <0x3000 0x100>;
                         interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
-                        dfsrr;
+                        fsl,preserve-clocking;
 
                         dtt@28 {
                                 compatible = "winbond,w83782d";
@@ -111,11 +111,11 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         cell-index = <1>;
-                        compatible = "fsl-i2c";
+                        compatible = "fsl,mpc8544-i2c", "fsl-i2c";
                         reg = <0x3100 0x100>;
                         interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
-                        dfsrr;
+                        fsl,preserve-clocking;
                 };
 
                 enet0: ethernet@24000 {
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 5b669ea0da2c..00f7ed7a2455 100644
--- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -397,10 +397,13 @@
                 upm@3,0 {
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        compatible = "fsl,upm-nand";
+                        compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand";
                         reg = <3 0x0 0x800>;
                         fsl,upm-addr-offset = <0x10>;
                         fsl,upm-cmd-offset = <0x08>;
+                        /* Micron MT29F8G08FAB multi-chip device */
+                        fsl,upm-addr-line-cs-offsets = <0x0 0x200>;
+                        fsl,upm-wait-flags = <0x5>;
                         chip-delay = <25>; // in micro-seconds
 
                         nand@0 {
@@ -409,7 +412,7 @@
 
                                 partition@0 {
                                             label = "fs";
-                                            reg = <0x00000000 0x01000000>;
+                                            reg = <0x00000000 0x10000000>;
                                 };
                         };
                 };
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
index 61437bfd3127..673e4a778ac8 100644
--- a/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -397,10 +397,13 @@
                 upm@3,0 {
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        compatible = "fsl,upm-nand";
+                        compatible = "tqc,tqm8548-upm-nand", "fsl,upm-nand";
                         reg = <3 0x0 0x800>;
                         fsl,upm-addr-offset = <0x10>;
                         fsl,upm-cmd-offset = <0x08>;
+                        /* Micron MT29F8G08FAB multi-chip device */
+                        fsl,upm-addr-line-cs-offsets = <0x0 0x200>;
+                        fsl,upm-wait-flags = <0x5>;
                         chip-delay = <25>; // in micro-seconds
 
                         nand@0 {
@@ -409,7 +412,7 @@
 
                                 partition@0 {
                                             label = "fs";
-                                            reg = <0x00000000 0x01000000>;
+                                            reg = <0x00000000 0x10000000>;
                                 };
                         };
                 };