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

diff --combined arch/powerpc/boot/dts/tqm8548-bigflash.dts
index 5b669ea0da2c8926230a1978178bd151f960a368,19aa72301c837348b7d04c91c0b167faa232569c..00f7ed7a24552295020fdc632b52527863f38709
--- 1/arch/powerpc/boot/dts/tqm8548-bigflash.dts
--- 2/arch/powerpc/boot/dts/tqm8548-bigflash.dts
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@@ -85,9 -85,9 +85,9 @@@
                        interrupt-parent = <&mpic>;
                        dfsrr;
  
 -                      dtt@50 {
 +                      dtt@48 {
                                compatible = "national,lm75";
 -                              reg = <0x50>;
 +                              reg = <0x48>;
                        };
  
                        rtc@68 {
@@@ -247,7 -247,7 +247,7 @@@
                        interrupts = <31 2 32 2 33 2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi2>;
 -                      phy-handle = <&phy3>;
 +                      phy-handle = <&phy4>;
  
                        mdio@520 {
                                #address-cells = <1>;
@@@ -275,7 -275,7 +275,7 @@@
                        interrupts = <37 2 38 2 39 2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi3>;
 -                      phy-handle = <&phy4>;
 +                      phy-handle = <&phy5>;
  
                        mdio@520 {
                                #address-cells = <1>;
@@@ -397,10 -397,13 +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 +412,7 @@@
  
                                partition@0 {
                                            label = "fs";
-                                           reg = <0x00000000 0x01000000>;
+                                           reg = <0x00000000 0x10000000>;
                                };
                        };
                };

diff --combined arch/powerpc/boot/dts/tqm8548.dts
index 61437bfd3127ea6b7258b4cbcfb872d13cde6b57,49145a04fc6c2b892535036ec2b1de89a76e38b7..673e4a778ac8129753a32bdd449c93cd3038b1e6
--- 1/arch/powerpc/boot/dts/tqm8548.dts
--- 2/arch/powerpc/boot/dts/tqm8548.dts
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@@ -85,9 -85,9 +85,9 @@@
                        interrupt-parent = <&mpic>;
                        dfsrr;
  
 -                      dtt@50 {
 +                      dtt@48 {
                                compatible = "national,lm75";
 -                              reg = <0x50>;
 +                              reg = <0x48>;
                        };
  
                        rtc@68 {
@@@ -247,7 -247,7 +247,7 @@@
                        interrupts = <31 2 32 2 33 2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi2>;
 -                      phy-handle = <&phy3>;
 +                      phy-handle = <&phy4>;
  
                        mdio@520 {
                                #address-cells = <1>;
@@@ -275,7 -275,7 +275,7 @@@
                        interrupts = <37 2 38 2 39 2>;
                        interrupt-parent = <&mpic>;
                        tbi-handle = <&tbi3>;
 -                      phy-handle = <&phy4>;
 +                      phy-handle = <&phy5>;
  
                        mdio@520 {
                                #address-cells = <1>;
@@@ -397,10 -397,13 +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 +412,7 @@@
  
                                partition@0 {
                                            label = "fs";
-                                           reg = <0x00000000 0x01000000>;
+                                           reg = <0x00000000 0x10000000>;
                                };
                        };
                };

diff --combined include/linux/fsl_devices.h
index 43fc95d822d5e51f2ddd21321a2791c96613abf4,0cde1806cfabad0ec8e4318204e88a68527b3945..244677cc082bba2a1173d49b9c5d15610b041cc4
--- 1/include/linux/fsl_devices.h
--- 2/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@@ -43,6 -43,10 +43,6 @@@
   *
   */
  
 -/* Flags related to I2C device features */
 -#define FSL_I2C_DEV_SEPARATE_DFSRR    0x00000001
 -#define FSL_I2C_DEV_CLOCK_5200                0x00000002
 -
  enum fsl_usb2_operating_modes {
        FSL_USB2_MPH_HOST,
        FSL_USB2_DR_HOST,
@@@ -79,6 -83,10 +79,10 @@@ struct fsl_spi_platform_data 
        u16     max_chipselect;
        void    (*cs_control)(struct spi_device *spi, bool on);
        u32     sysclk;
+ 
+       /* Legacy hooks, used by mpc52xx_psc_spi driver. */
+       void    (*activate_cs)(u8 cs, u8 polarity);
+       void    (*deactivate_cs)(u8 cs, u8 polarity);
  };
  
  struct mpc8xx_pcmcia_ops {