Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull GPIO updates from Grant Likely:
 "GPIO follow up patch and type change for v3.5 merge window

  Primarily device driver additions, features and bug fixes.  Not much
  touching gpio common subsystem support.  Should not be scary."

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
  gpio: Provide the STMPE GPIO driver with its own IRQ Domain
  gpio: add TS-5500 DIO blocks support
  gpio: pcf857x: use client->irq for gpio_to_irq()
  gpio: stmpe: Add DT support for stmpe gpio
  gpio: pl061 depends on ARM
  gpio/pl061: remove old comment
  gpio: SPEAr: add spi chipselect control driver
  gpio: gpio-max710x: Support device tree probing
  gpio: twl4030: Use only TWL4030_MODULE_LED for LED configuration
  gpio: tegra: read output value when gpio is set in direction_out
  gpio: pca953x: Add compatible strings to gpio-pca953x driver
  gpio: pca953x: Register an IRQ domain
  gpio: mvebu: Set free callback for gpio_chip
  gpio: tegra: Drop exporting static functions
  gpio: tegra: Staticize non-exported symbols
  gpio: tegra: fix suspend/resume apis
  gpio-pch: Set parent dev for gpio chip
  gpio: em: Fix build errors
  GPIO: clps711x: use platform_device_unregister in gpio_clps711x_init()
  gpio/tc3589x: convert to use the simple irqdomain
  ...

1 files changed, 31 insertions, 1 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index f16557690cfd..14a6c2913e49 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -90,11 +90,26 @@ config GPIO_DA9052
         help
           Say yes here to enable the GPIO driver for the DA9052 chip.
 
+config GPIO_DA9055
+        tristate "Dialog Semiconductor DA9055 GPIO"
+        depends on MFD_DA9055
+        help
+          Say yes here to enable the GPIO driver for the DA9055 chip.
+
+          The Dialog DA9055 PMIC chip has 3 GPIO pins that can be
+          be controller by this driver.
+
+          If driver is built as a module it will be called gpio-da9055.
+
 config GPIO_MAX730X
         tristate
 
 comment "Memory mapped GPIO drivers:"
 
+config GPIO_CLPS711X
+        def_bool y
+        depends on ARCH_CLPS711X
+
 config GPIO_GENERIC_PLATFORM
         tristate "Generic memory-mapped GPIO controller support (MMIO platform device)"
         select GPIO_GENERIC
@@ -174,7 +189,7 @@ config GPIO_MXS
 
 config GPIO_PL061
         bool "PrimeCell PL061 GPIO support"
-        depends on ARM_AMBA
+        depends on ARM && ARM_AMBA
         select GENERIC_IRQ_CHIP
         help
           Say yes here to support the PrimeCell PL061 GPIO device
@@ -185,6 +200,13 @@ config GPIO_PXA
         help
           Say yes here to support the PXA GPIO device
 
+config GPIO_SPEAR_SPICS
+        bool "ST SPEAr13xx SPI Chip Select as GPIO support"
+        depends on PLAT_SPEAR
+        select GENERIC_IRQ_CHIP
+        help
+          Say yes here to support ST SPEAr SPI Chip Select as GPIO device
+
 config GPIO_STA2X11
         bool "STA2x11/ConneXt GPIO support"
         depends on MFD_STA2X11
@@ -193,6 +215,14 @@ config GPIO_STA2X11
           Say yes here to support the STA2x11/ConneXt GPIO device.
           The GPIO module has 128 GPIO pins with alternate functions.
 
+config GPIO_TS5500
+        tristate "TS-5500 DIO blocks and compatibles"
+        help
+          This driver supports Digital I/O exposed by pin blocks found on some
+          Technologic Systems platforms. It includes, but is not limited to, 3
+          blocks of the TS-5500: DIO1, DIO2 and the LCD port, and the TS-5600
+          LCD port.
+
 config GPIO_VT8500
         bool "VIA/Wondermedia SoC GPIO Support"
         depends on ARCH_VT8500