Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[can-eth-gw-linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index be117c386de54e25c9dd2c5d1a7b1163200e81b6..bf892bd68c1769fa35de808fcaf54e739fb142bc 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -47,7 +47,11 @@ if GPIOLIB
 
 config OF_GPIO
        def_bool y
-       depends on OF && !SPARC
+       depends on OF
+
+config GPIO_ACPI
+       def_bool y
+       depends on ACPI
 
 config DEBUG_GPIO
        bool "Debug GPIO calls"
@@ -86,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
@@ -152,7 +171,7 @@ config GPIO_MSM_V2
 
 config GPIO_MVEBU
        def_bool y
-       depends on ARCH_MVEBU
+       depends on PLAT_ORION
        select GPIO_GENERIC
        select GENERIC_IRQ_CHIP
 
@@ -170,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
@@ -181,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
@@ -189,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
@@ -466,7 +500,7 @@ config GPIO_ADP5588_IRQ
 
 config GPIO_ADNP
        tristate "Avionic Design N-bit GPIO expander"
-       depends on I2C && OF
+       depends on I2C && OF_GPIO
        help
          This option enables support for N GPIOs found on Avionic Design
          I2C GPIO expanders. The register space will be extended by powers