Merge branch 'pxa-plat' into devel

* pxa-plat: (53 commits)
  [ARM] 4762/1: Basic support for Toradex Colibri module
  [ARM] pxa: fix mci_init functions returning -1
  [ARM] 4737/1: Refactor corgi_lcd to improve readability + bugfix
  [ARM] 4747/1: pcm027: support for pcm990 baseboard for phyCORE-PXA270
  [ARM] 4746/1: pcm027: network support for phyCORE-PXA270
  [ARM] 4745/1: pcm027: default configuration
  [ARM] 4744/1: pcm027: add support for phyCORE-PXA270 CPU module
  [NET] smc91x: Make smc91x use IRQ resource trigger flags
  [ARM] pxa: add default config for littleton
  [ARM] pxa: add basic support for Littleton (PXA3xx Form Factor Platform)
  [ARM] 4664/1: Add basic support for HTC Magician PDA phones
  [ARM] 4649/1: Base support for pxa-based Toshiba e-series PDAs.
  [ARM] pxa: skip registers saving/restoring if entering standby mode
  [ARM] pxa: fix PXA27x resume
  [ARM] pxa: Avoid fiddling with CKEN register on suspend
  [ARM] pxa: Add PXA3 standby code hooked into the IRQ wake scheme
  [ARM] pxa: Add zylonite MFP wakeup configurations
  [ARM] pxa: program MFPs for low power mode when suspending
  [ARM] pxa: make MFP configuration processor independent
  [ARM] pxa: remove un-used pxa3xx_mfp_set_xxx() functions
  ...

Conflicts:

	arch/arm/mach-pxa/ssp.c

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

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

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

diff --cc arch/arm/mach-pxa/pxa27x.c
index 57efebdc4324bb1990eb505604677cf7b5b32a4a,db0c4c6fea9ba06ae2bb91673e8004cfb645901c..96cf274ec7cbb7fa9a59c2f48263a06ae791f06f
--- 1/arch/arm/mach-pxa/pxa27x.c
--- 2/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@@ -424,15 -390,8 +391,13 @@@ struct platform_device pxa27x_device_i2
        .num_resources  = ARRAY_SIZE(i2c_power_resources),
  };
  
 +void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 +{
 +      pxa27x_device_i2c_power.dev.platform_data = info;
 +}
 +
  static struct platform_device *devices[] __initdata = {
-       &pxa_device_mci,
        &pxa_device_udc,
-       &pxa_device_fb,
        &pxa_device_ffuart,
        &pxa_device_btuart,
        &pxa_device_stuart,

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

diff --cc arch/arm/mach-pxa/ssp.c
index b2eb38543d1c3e4b73890e3af0053357a550cfab,4954da907d429f954e792d64c88e6884830356af..00af7f2fed66e5e865c4262b0a58313ab251fd2e
--- 1/arch/arm/mach-pxa/ssp.c
--- 2/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
@@@ -42,35 -45,14 +45,14 @@@
  
  #define TIMEOUT 100000
  
- struct ssp_info_ {
-       int irq;
-       u32 clock;
- };
- 
- /*
-  * SSP port clock and IRQ settings
-  */
- static const struct ssp_info_ ssp_info[PXA_SSP_PORTS] = {
- #if defined (CONFIG_PXA27x)
-       {IRQ_SSP,       CKEN_SSP1},
-       {IRQ_SSP2,      CKEN_SSP2},
-       {IRQ_SSP3,      CKEN_SSP3},
- #else
-       {IRQ_SSP,       CKEN_SSP},
-       {IRQ_NSSP,      CKEN_NSSP},
-       {IRQ_ASSP,      CKEN_ASSP},
- #endif
- };
- 
- static DEFINE_MUTEX(mutex);
- static int use_count[PXA_SSP_PORTS] = {0, 0, 0};
- 
  static irqreturn_t ssp_interrupt(int irq, void *dev_id)
  {
 -      struct ssp_dev *dev = (struct ssp_dev*) dev_id;
 +      struct ssp_dev *dev = dev_id;
-       unsigned int status = SSSR_P(dev->port);
+       struct ssp_device *ssp = dev->ssp;
+       unsigned int status;
  
-       SSSR_P(dev->port) = status; /* clear status bits */
+       status = __raw_readl(ssp->mmio_base + SSSR);
+       __raw_writel(status, ssp->mmio_base + SSSR);
  
        if (status & SSSR_ROR)
                printk(KERN_WARNING "SSP(%d): receiver overrun\n", dev->port);