Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c

diff --cc arch/arm/mach-ep93xx/core.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.c
Simple merge

diff --cc arch/arm/mach-mx3/clock-imx35.c
Simple merge

diff --cc arch/arm/mach-mx3/devices.c
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
index eb98eb8d3731c1ce51ff9aa0bc603be866e1c345,aa0725608fb17ec51e15cc077f0f3198a19018ab..b583121b04b9ff221dbf3b859c833d674e9fcbde
--- 1/arch/arm/mach-omap1/devices.c
--- 2/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@@ -231,67 -193,8 +194,32 @@@ static inline void omap_init_spi100k(vo
  
  /*-------------------------------------------------------------------------*/
  
- #if defined(CONFIG_OMAP_STI)
- 
- #define OMAP1_STI_BASE                0xfffea000
- #define OMAP1_STI_CHANNEL_BASE        (OMAP1_STI_BASE + 0x400)
- 
- static struct resource sti_resources[] = {
-       {
-               .start          = OMAP1_STI_BASE,
-               .end            = OMAP1_STI_BASE + SZ_1K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP1_STI_CHANNEL_BASE,
-               .end            = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = INT_1610_STI,
-               .flags          = IORESOURCE_IRQ,
-       }
- };
- 
- static struct platform_device sti_device = {
-       .name           = "sti",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(sti_resources),
-       .resource       = sti_resources,
- };
- 
- static inline void omap_init_sti(void)
- {
-       platform_device_register(&sti_device);
- }
- #else
  static inline void omap_init_sti(void) {}
- #endif
  
 +#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
 +
 +static struct platform_device omap_pcm = {
 +      .name   = "omap-pcm-audio",
 +      .id     = -1,
 +};
 +
 +OMAP_MCBSP_PLATFORM_DEVICE(1);
 +OMAP_MCBSP_PLATFORM_DEVICE(2);
 +OMAP_MCBSP_PLATFORM_DEVICE(3);
 +
 +static void omap_init_audio(void)
 +{
 +      platform_device_register(&omap_mcbsp1);
 +      platform_device_register(&omap_mcbsp2);
 +      if (!cpu_is_omap7xx())
 +              platform_device_register(&omap_mcbsp3);
 +      platform_device_register(&omap_pcm);
 +}
 +
 +#else
 +static inline void omap_init_audio(void) {}
 +#endif
 +
  /*-------------------------------------------------------------------------*/
  
  /*

diff --cc arch/arm/mach-omap2/board-n8x0.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 28978c08bcedbcf83a9b9dd76ac1e33450f3a421,9a5eb87425fcf91dc3164acf3b1386e38e655be7..897d960fe16f686ae5d5ef37251334c6bb850481
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -23,10 -23,8 +23,9 @@@
  #include <linux/gpio.h>
  #include <linux/gpio_keys.h>
  #include <linux/mmc/host.h>
 +#include <sound/tlv320aic3x.h>
  
  #include <plat/mcspi.h>
- #include <plat/mux.h>
  #include <plat/board.h>
  #include <plat/common.h>
  #include <plat/dma.h>
@@@ -716,17 -728,6 +728,17 @@@ static struct i2c_board_info __initdat
        },
  };
  
- static struct aic3x_pdata rx51_aic34_data = {
 +/* Audio setup data */
 +static struct aic3x_setup_data rx51_aic34_setup = {
 +      .gpio_func[0] = AIC3X_GPIO1_FUNC_DISABLED,
 +      .gpio_func[1] = AIC3X_GPIO2_FUNC_DIGITAL_MIC_INPUT,
 +};
 +
++static struct aic3x_pdata rx51_aic3x_data = {
 +      .setup = &rx51_aic34_setup,
 +      .gpio_reset = 60,
 +};
 +
  static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = {
        {
                I2C_BOARD_INFO("tlv320aic3x", 0x18),

diff --cc arch/arm/mach-omap2/board-zoom2.c
index 410fe006c0f6c7ed5bab7c76384623905415b920,3ad9ecf7f5e2b32d2361ae1df84aaa54b63013f8..efbcd8fb21ece91f0141c2a95807a32e827da7d5
--- 1/arch/arm/mach-omap2/board-zoom2.c
--- 2/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -102,7 -135,8 +156,9 @@@ static void __init omap_zoom2_init(void
  {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
        zoom_peripherals_init();
 +      omap3_zoom2_i2c_init();
+       board_nand_init(zoom_nand_partitions,
+                       ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS);
        zoom_debugboard_init();
  }
  

diff --cc arch/arm/mach-omap2/devices.c
index f9a5961d23a7035049d2299c059686d8d0a42fd7,2dbb265bedd4e914c6ceac472dbe9a0b8bddbf0b..08e1ad5adb14bc66b1d6313ae675854d403001d2
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -231,102 -233,8 +234,45 @@@ static inline void omap_init_mbox(void
  static inline void omap_init_mbox(void) { }
  #endif /* CONFIG_OMAP_MBOX_FWK */
  
- #if defined(CONFIG_OMAP_STI)
- 
- #if defined(CONFIG_ARCH_OMAP2)
- 
- #define OMAP2_STI_BASE                0x48068000
- #define OMAP2_STI_CHANNEL_BASE        0x54000000
- #define OMAP2_STI_IRQ         4
- 
- static struct resource sti_resources[] = {
-       {
-               .start          = OMAP2_STI_BASE,
-               .end            = OMAP2_STI_BASE + 0x7ff,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_CHANNEL_BASE,
-               .end            = OMAP2_STI_CHANNEL_BASE + SZ_64K - 1,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP2_STI_IRQ,
-               .flags          = IORESOURCE_IRQ,
-       }
- };
- #elif defined(CONFIG_ARCH_OMAP3)
- 
- #define OMAP3_SDTI_BASE               0x54500000
- #define OMAP3_SDTI_CHANNEL_BASE       0x54600000
- 
- static struct resource sti_resources[] = {
-       {
-               .start          = OMAP3_SDTI_BASE,
-               .end            = OMAP3_SDTI_BASE + 0xFFF,
-               .flags          = IORESOURCE_MEM,
-       },
-       {
-               .start          = OMAP3_SDTI_CHANNEL_BASE,
-               .end            = OMAP3_SDTI_CHANNEL_BASE + SZ_1M - 1,
-               .flags          = IORESOURCE_MEM,
-       }
- };
- 
- #endif
- 
- static struct platform_device sti_device = {
-       .name           = "sti",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(sti_resources),
-       .resource       = sti_resources,
- };
- 
- static inline void omap_init_sti(void)
- {
-       platform_device_register(&sti_device);
- }
- #else
  static inline void omap_init_sti(void) {}
- #endif
  
 +#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
 +
 +static struct platform_device omap_pcm = {
 +      .name   = "omap-pcm-audio",
 +      .id     = -1,
 +};
 +
 +/*
 + * OMAP2420 has 2 McBSP ports
 + * OMAP2430 has 5 McBSP ports
 + * OMAP3 has 5 McBSP ports
 + * OMAP4 has 4 McBSP ports
 + */
 +OMAP_MCBSP_PLATFORM_DEVICE(1);
 +OMAP_MCBSP_PLATFORM_DEVICE(2);
 +OMAP_MCBSP_PLATFORM_DEVICE(3);
 +OMAP_MCBSP_PLATFORM_DEVICE(4);
 +OMAP_MCBSP_PLATFORM_DEVICE(5);
 +
 +static void omap_init_audio(void)
 +{
 +      platform_device_register(&omap_mcbsp1);
 +      platform_device_register(&omap_mcbsp2);
 +      if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
 +              platform_device_register(&omap_mcbsp3);
 +              platform_device_register(&omap_mcbsp4);
 +      }
 +      if (cpu_is_omap243x() || cpu_is_omap34xx())
 +              platform_device_register(&omap_mcbsp5);
 +
 +      platform_device_register(&omap_pcm);
 +}
 +
 +#else
 +static inline void omap_init_audio(void) {}
 +#endif
 +
  #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
  
  #include <plat/mcspi.h>

diff --cc arch/arm/mach-omap2/include/mach/board-zoom.h
index b6a010fc8bda3f5eb363711733a462ce93bfbefa,3af69d2c3dcde626a6f74cdff393cc3be7926201..80591fda8f8f7732a992d991280a744614445ce3
--- 1/arch/arm/mach-omap2/include/mach/board-zoom.h
--- 2/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@@ -1,7 -1,11 +1,13 @@@
  /*
   * Defines for zoom boards
   */
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ 
+ #define ZOOM_NAND_CS    0
+ 
+ extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs);
  extern int __init zoom_debugboard_init(void);
  extern void __init zoom_peripherals_init(void);
 +
 +#define ZOOM2_HEADSET_EXTMUTE_GPIO    153

diff --cc arch/arm/mach-pxa/devices.c
Simple merge

diff --cc arch/arm/mach-pxa/devices.h
Simple merge

diff --cc arch/arm/mach-pxa/pxa27x.c
index 465008293a259137fd04eb498b757c392251c214,12e5b9f01e6f6271f73623aa47f5be826b86bd2a..d1fbf29d561c5cbe4b49e634ccb9953f6b1a4f27
--- 1/arch/arm/mach-pxa/pxa27x.c
--- 2/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -383,11 -383,8 +383,12 @@@ void __init pxa27x_set_i2c_power_info(s
  
  static struct platform_device *devices[] __initdata = {
        &pxa27x_device_udc,
+       &pxa_device_pmu,
        &pxa_device_i2s,
 +      &pxa_device_asoc_ssp1,
 +      &pxa_device_asoc_ssp2,
 +      &pxa_device_asoc_ssp3,
 +      &pxa_device_asoc_platform,
        &sa1100_device_rtc,
        &pxa_device_rtc,
        &pxa27x_device_ssp1,

diff --cc arch/arm/mach-pxa/pxa3xx.c
index f7a3b158ca97278d1de14250822fdd6100b2aed5,fa0014847c71503f4f929870cce2622deb0abd9d..90974e6fae6a69458a91b4bc82f281baa5f3b003
--- 1/arch/arm/mach-pxa/pxa3xx.c
--- 2/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@@ -596,12 -608,8 +608,13 @@@ void __init pxa3xx_set_i2c_power_info(s
  
  static struct platform_device *devices[] __initdata = {
        &pxa27x_device_udc,
+       &pxa_device_pmu,
        &pxa_device_i2s,
 +      &pxa_device_asoc_ssp1,
 +      &pxa_device_asoc_ssp2,
 +      &pxa_device_asoc_ssp3,
 +      &pxa_device_asoc_ssp4,
 +      &pxa_device_asoc_platform,
        &sa1100_device_rtc,
        &pxa_device_rtc,
        &pxa27x_device_ssp1,

diff --cc arch/arm/mach-s3c64xx/dev-audio.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index 362fc76ee726d0a76865245b342cbb310442357f,d498219fff1bd34ed1c8b180a67c1ce24fe1835c..ecbddd377cb88b583b483efeb7b97830d5fd2f1d
--- 1/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- 2/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -256,8 -283,8 +283,9 @@@ static struct platform_device *smdk6410
        &s3c_device_fb,
        &s3c_device_ohci,
        &s3c_device_usb_hsotg,
 +      &s3c_device_pcm,
        &s3c64xx_device_iisv4,
+       &samsung_device_keypad,
  
  #ifdef CONFIG_REGULATOR
        &smdk6410_b_pwr_5v,

diff --cc arch/arm/plat-mxc/audmux-v2.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/devs.h
Simple merge

diff --cc sound/soc/codecs/wm8776.c
Simple merge

diff --cc sound/soc/fsl/mpc5200_dma.h
Simple merge

diff --cc sound/soc/fsl/mpc5200_psc_ac97.c
index 11706c128c08e6eb215c1d3911fdb8fcdfa380c2,a9560235daeee3d4260d6066f9951bc89aa5ab4f..40acc8e2b1cac1a36ba8a94d11dccd9d10129e55
--- 1/sound/soc/fsl/mpc5200_psc_ac97.c
--- 2/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@@ -258,10 -277,10 +272,10 @@@ static struct snd_soc_dai_driver psc_ac
   * - Probe/remove operations
   * - OF device match table
   */
- static int __devinit psc_ac97_of_probe(struct of_device *op,
+ static int __devinit psc_ac97_of_probe(struct platform_device *op,
                                      const struct of_device_id *match)
  {
 -      int rc, i;
 +      int rc;
        struct snd_ac97 ac97;
        struct mpc52xx_psc __iomem *regs;
  
@@@ -288,10 -317,9 +302,10 @@@
        return 0;
  }
  
- static int __devexit psc_ac97_of_remove(struct of_device *op)
+ static int __devexit psc_ac97_of_remove(struct platform_device *op)
  {
 -      return mpc5200_audio_dma_destroy(op);
 +      snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_ac97_dai));
 +      return 0;
  }
  
  /* Match table for of_platform binding */

diff --cc sound/soc/fsl/mpc5200_psc_i2s.c
index 5b9f2c73f031ce85beab138aa20af89044ec6f31,534f04cb15d7d1df602b4d8a3e65c962d93ad845..74ffed41340ff00c5d9ba97dc927059731b80673
--- 1/sound/soc/fsl/mpc5200_psc_i2s.c
--- 2/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@@ -199,10 -205,9 +199,10 @@@ static int __devinit psc_i2s_of_probe(s
  
  }
  
- static int __devexit psc_i2s_of_remove(struct of_device *op)
+ static int __devexit psc_i2s_of_remove(struct platform_device *op)
  {
 -      return mpc5200_audio_dma_destroy(op);
 +      snd_soc_unregister_dais(&op->dev, ARRAY_SIZE(psc_i2s_dai));
 +      return 0;
  }
  
  /* Match table for of_platform binding */

diff --cc sound/soc/imx/imx-ssi.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge