Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
  gpio/pch_gpio: Support new device ML7223
  gpio: make gpio_{request,free}_array gpio array parameter const
  GPIO: OMAP: move to drivers/gpio
  GPIO: OMAP: move register offset defines into <plat/gpio.h>
  gpio: Convert gpio_is_valid to return bool
  gpio: Move the s5pc100 GPIO to drivers/gpio
  gpio: Move the s5pv210 GPIO to drivers/gpio
  gpio: Move the exynos4 GPIO to drivers/gpio
  gpio: Move to Samsung common GPIO library to drivers/gpio
  gpio/nomadik: add function to read GPIO pull down status
  gpio/nomadik: show all pins in debug
  gpio: move Nomadik GPIO driver to drivers/gpio
  gpio: move U300 GPIO driver to drivers/gpio
  langwell_gpio: add runtime pm support
  gpio/pca953x: Add support for pca9574 and pca9575 devices
  gpio/cs5535: Show explicit dependency between gpio_cs5535 and mfd_cs5535

diff --combined arch/arm/mach-exynos4/Makefile
index 683fc387c8af39d612b91b5f1e1074da24ea2b73,97837e75afa3c5e2beeb7ba88a3bbb1de390caf2..a9bb94fabaa71c3ca31e823d9ad87aa409f0bfb2
--- 1/arch/arm/mach-exynos4/Makefile
--- 2/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@@ -13,10 -13,9 +13,10 @@@ obj-                                :
  # Core support for EXYNOS4 system
  
  obj-$(CONFIG_CPU_EXYNOS4210)  += cpu.o init.o clock.o irq-combiner.o
- obj-$(CONFIG_CPU_EXYNOS4210)  += setup-i2c0.o gpiolib.o irq-eint.o dma.o
+ obj-$(CONFIG_CPU_EXYNOS4210)  += setup-i2c0.o irq-eint.o dma.o
  obj-$(CONFIG_PM)              += pm.o sleep.o
  obj-$(CONFIG_CPU_FREQ)                += cpufreq.o
 +obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  
  obj-$(CONFIG_SMP)             += platsmp.o headsmp.o
  

diff --combined drivers/gpio/Kconfig
index d213646037553cabba73180bc4beb1b6d6d68440,978852afc9dc49adf32fbb5ce8085cac9cbb4299..592397629ddc9c211403d5c04369b2ea9fc37ee7
--- 1/drivers/gpio/Kconfig
--- 2/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -86,6 -86,30 +86,30 @@@ config GPIO_IT8761
        help
          Say yes here to support GPIO functionality of IT8761E super I/O chip.
  
+ config GPIO_EXYNOS4
+       bool "Samsung Exynos4 GPIO library support"
+       default y if CPU_EXYNOS4210
+       help
+         Say yes here to support Samsung Exynos4 series SoCs GPIO library
+ 
+ config GPIO_PLAT_SAMSUNG
+       bool "Samsung SoCs GPIO library support"
+       default y if SAMSUNG_GPIOLIB_4BIT
+       help
+         Say yes here to support Samsung SoCs GPIO library
+ 
+ config GPIO_S5PC100
+       bool "Samsung S5PC100 GPIO library support"
+       default y if CPU_S5PC100
+       help
+         Say yes here to support Samsung S5PC100 SoCs GPIO library
+ 
+ config GPIO_S5PV210
+       bool "Samsung S5PV210/S5PC110 GPIO library support"
+       default y if CPU_S5PV210
+       help
+         Say yes here to support Samsung S5PV210/S5PC110 SoCs GPIO library
+ 
  config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"
        depends on ARM_AMBA
@@@ -303,7 -327,7 +327,7 @@@ comment "PCI GPIO expanders:
  
  config GPIO_CS5535
        tristate "AMD CS5535/CS5536 GPIO support"
-       depends on PCI && X86 && !CS5535_GPIO
+       depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535
        help
          The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
          can be used for quite a number of things.  The CS5535/6 is found on
@@@ -334,13 -358,19 +358,19 @@@ config GPIO_LANGWEL
          Say Y here to support Intel Langwell/Penwell GPIO.
  
  config GPIO_PCH
-       tristate "PCH GPIO of Intel Topcliff"
+       tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GPIO"
        depends on PCI && X86
        help
          This driver is for PCH(Platform controller Hub) GPIO of Intel Topcliff
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          This driver can access PCH GPIO device.
  
+         This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
+         Output Hub), ML7223.
+         ML7223 IOH is for MP(Media Phone) use.
+         ML7223 is companion chip for Intel Atom E6xx series.
+         ML7223 is completely compatible for Intel EG20T PCH.
+ 
  config GPIO_ML_IOH
        tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"
        depends on PCI
@@@ -424,11 -454,4 +454,11 @@@ config AB8500_GPI
        depends on AB8500_CORE && BROKEN
        help
          Select this to enable the AB8500 IC GPIO driver
 +
 +config GPIO_TPS65910
 +      bool "TPS65910 GPIO"
 +      depends on MFD_TPS65910
 +      help
 +        Select this option to enable GPIO driver for the TPS65910
 +        chip family.
  endif

diff --combined drivers/gpio/Makefile
index 6a3387acc0e5d71b8daae00da808f271bca6ed3f,4182040a3522d3631a25336c2b1b59b0d224a752..b605f8ec6fbe0afc01e6c4604de67e6a85f98add
--- 1/drivers/gpio/Makefile
--- 2/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -8,6 -8,10 +8,10 @@@ obj-$(CONFIG_GPIO_ADP5520)     += adp5520-g
  obj-$(CONFIG_GPIO_ADP5588)    += adp5588-gpio.o
  obj-$(CONFIG_GPIO_BASIC_MMIO_CORE)    += basic_mmio_gpio.o
  obj-$(CONFIG_GPIO_BASIC_MMIO) += basic_mmio_gpio.o
+ obj-$(CONFIG_GPIO_EXYNOS4)    += gpio-exynos4.o
+ obj-$(CONFIG_GPIO_PLAT_SAMSUNG)       += gpio-plat-samsung.o
+ obj-$(CONFIG_GPIO_S5PC100)    += gpio-s5pc100.o
+ obj-$(CONFIG_GPIO_S5PV210)    += gpio-s5pv210.o
  obj-$(CONFIG_GPIO_LANGWELL)   += langwell_gpio.o
  obj-$(CONFIG_GPIO_MAX730X)    += max730x.o
  obj-$(CONFIG_GPIO_MAX7300)    += max7300.o
@@@ -16,6 -20,7 +20,7 @@@ obj-$(CONFIG_GPIO_MAX732X)    += max732x.
  obj-$(CONFIG_GPIO_MC33880)    += mc33880.o
  obj-$(CONFIG_GPIO_MCP23S08)   += mcp23s08.o
  obj-$(CONFIG_GPIO_74X164)     += 74x164.o
+ obj-$(CONFIG_ARCH_OMAP)         += gpio-omap.o
  obj-$(CONFIG_GPIO_PCA953X)    += pca953x.o
  obj-$(CONFIG_GPIO_PCF857X)    += pcf857x.o
  obj-$(CONFIG_GPIO_PCH)                += pch_gpio.o
@@@ -34,10 -39,11 +39,12 @@@ obj-$(CONFIG_GPIO_WM831X)  += wm831x-gpi
  obj-$(CONFIG_GPIO_WM8350)     += wm8350-gpiolib.o
  obj-$(CONFIG_GPIO_WM8994)     += wm8994-gpio.o
  obj-$(CONFIG_GPIO_SCH)                += sch_gpio.o
+ obj-$(CONFIG_MACH_U300)               += gpio-u300.o
+ obj-$(CONFIG_PLAT_NOMADIK)    += gpio-nomadik.o
  obj-$(CONFIG_GPIO_RDC321X)    += rdc321x-gpio.o
  obj-$(CONFIG_GPIO_JANZ_TTL)   += janz-ttl.o
  obj-$(CONFIG_GPIO_SX150X)     += sx150x.o
  obj-$(CONFIG_GPIO_VX855)      += vx855_gpio.o
  obj-$(CONFIG_GPIO_ML_IOH)     += ml_ioh_gpio.o
  obj-$(CONFIG_AB8500_GPIO)       += ab8500-gpio.o
 +obj-$(CONFIG_GPIO_TPS65910)   += tps65910-gpio.o