From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 03:32:39 +0000 (+1100)
Subject: Merge remote-tracking branch 'mfd/for-next'
X-Git-Tag: next-20111004~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ccbdd3a19c65a1f7a3e407e8a58d436944785f96;p=karo-tx-linux.git

Merge remote-tracking branch 'mfd/for-next'

Conflicts:
	arch/arm/mach-u300/include/mach/irqs.h
---

ccbdd3a19c65a1f7a3e407e8a58d436944785f96
diff --cc arch/arm/mach-u300/include/mach/irqs.h
index d270fea32926,a6867b12773e..db3fbfa1d6e9
--- a/arch/arm/mach-u300/include/mach/irqs.h
+++ b/arch/arm/mach-u300/include/mach/irqs.h
@@@ -106,25 -106,9 +106,17 @@@
  #define IRQ_U300_NFIF			45
  #define IRQ_U300_NFIF2			46
  #define IRQ_U300_SYSCON_PLL_LOCK	47
 -#define U300_NR_IRQS			48
 +#define U300_VIC_IRQS_END		48
  #endif
  
 -#define NR_IRQS U300_NR_IRQS
 +/* Maximum 8*7 GPIO lines */
 +#ifdef CONFIG_GPIO_U300
 +#define IRQ_U300_GPIO_BASE		(U300_VIC_IRQS_END)
 +#define IRQ_U300_GPIO_END		(IRQ_U300_GPIO_BASE + 56)
 +#else
 +#define IRQ_U300_GPIO_END		(U300_VIC_IRQS_END)
 +#endif
 +
- /* Optional AB3550 mixsig chip */
- #ifdef CONFIG_AB3550_CORE
- #define IRQ_AB3550_BASE			(IRQ_U300_GPIO_END)
- #define IRQ_AB3550_END			(IRQ_AB3550_BASE + 38)
- #else
- #define IRQ_AB3550_END			(IRQ_U300_GPIO_END)
- #endif
- 
- #define NR_IRQS				(IRQ_AB3550_END)
++#define NR_IRQS				(IRQ_U300_GPIO_END)
  
  #endif
diff --cc arch/arm/mach-ux500/board-u5500.c
index e014aa749b03,5c9e66502ebb..82025ba70c03
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@@ -8,8 -8,10 +8,9 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/amba/bus.h>
 -#include <linux/gpio.h>
  #include <linux/irq.h>
  #include <linux/i2c.h>
+ #include <linux/mfd/ab5500/ab5500.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
diff --cc drivers/gpio/Kconfig
index 4ab5d6614ffa,fbc5fd449a04..646503036227
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -170,18 -178,9 +170,18 @@@ config GPIO_SC
  	  The Intel Tunnel Creek processor has 5 GPIOs powered by the
  	  core power rail and 9 from suspend power supply.
  
 +config GPIO_U300
 +	bool "ST-Ericsson U300 COH 901 335/571 GPIO"
 +	depends on GPIOLIB && ARCH_U300
 +	help
 +	  Say yes here to support GPIO interface on ST-Ericsson U300.
 +	  The names of the two IP block variants supported are
 +	  COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
 +	  ports of 8 GPIO pins each.
 +
  config GPIO_VX855
  	tristate "VIA VX855/VX875 GPIO"
- 	depends on MFD_SUPPORT && PCI
+ 	depends on PCI
  	select MFD_CORE
  	select MFD_VX855
  	help