From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 28 Jan 2008 13:21:38 +0000 (+0000)
Subject: Merge branch 'pxa-plat' into devel
X-Git-Tag: v2.6.25-rc1~1175^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0ff66f0c7a5f1f4f5a0d91341b6f71fd2a49f0fa;p=linux-2.6-omap-h63xx.git

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>
---

0ff66f0c7a5f1f4f5a0d91341b6f71fd2a49f0fa
diff --cc arch/arm/mach-pxa/pxa27x.c
index 57efebdc432,db0c4c6fea9..96cf274ec7c
--- a/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/ssp.c
index b2eb38543d1,4954da907d4..00af7f2fed6
--- a/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);