Merge tag 'drivers-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2c38d950a1e5105cb0540f5e84037f96481a4cf0..a86c49a605c63627b90d1def6fd8b038482ab005 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -55,6 +55,9 @@ config GPIO_ACPI
        def_bool y
        depends on ACPI
 
+config GPIOLIB_IRQCHIP
+       bool
+
 config DEBUG_GPIO
        bool "Debug GPIO calls"
        depends on DEBUG_KERNEL
@@ -128,6 +131,15 @@ config GPIO_GENERIC_PLATFORM
        help
          Say yes here to support basic platform_device memory-mapped GPIO controllers.
 
+config GPIO_DWAPB
+       tristate "Synopsys DesignWare APB GPIO driver"
+       select GPIO_GENERIC
+       select GENERIC_IRQ_CHIP
+       depends on OF_GPIO
+       help
+         Say Y or M here to build support for the Synopsys DesignWare APB
+         GPIO block.
+
 config GPIO_IT8761E
        tristate "IT8761E GPIO support"
        depends on X86  # unconditional access to IO space.
@@ -145,6 +157,12 @@ config GPIO_EP93XX
        depends on ARCH_EP93XX
        select GPIO_GENERIC
 
+config GPIO_ZEVIO
+       bool "LSI ZEVIO SoC memory mapped GPIOs"
+       depends on ARM && OF_GPIO
+       help
+         Say yes here to support the GPIO controller in LSI ZEVIO SoCs.
+
 config GPIO_MM_LANTIQ
        bool "Lantiq Memory mapped GPIOs"
        depends on LANTIQ && SOC_XWAY
@@ -228,7 +246,8 @@ config GPIO_OCTEON
 config GPIO_PL061
        bool "PrimeCell PL061 GPIO support"
        depends on ARM_AMBA
-       select GENERIC_IRQ_CHIP
+       select IRQ_DOMAIN
+       select GPIOLIB_IRQCHIP
        help
          Say yes here to support the PrimeCell PL061 GPIO device
 
@@ -275,8 +294,15 @@ 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_SYSCON
+       tristate "GPIO based on SYSCON"
+       depends on MFD_SYSCON && OF
+       help
+         Say yes here to support GPIO functionality though SYSCON driver.
+
 config GPIO_TS5500
        tristate "TS-5500 DIO blocks and compatibles"
+       depends on TS5500 || COMPILE_TEST
        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
@@ -462,7 +488,7 @@ config GPIO_MC9S08DZ60
          Select this to enable the MC9S08DZ60 GPIO driver
 
 config GPIO_PCA953X
-       tristate "PCA953x, PCA955x, PCA957x, TCA64xx, and MAX7310 I/O ports"
+       tristate "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports"
        depends on I2C
        help
          Say yes here to provide access to several register-oriented
@@ -472,11 +498,15 @@ config GPIO_PCA953X
          4 bits:       pca9536, pca9537
 
          8 bits:       max7310, max7315, pca6107, pca9534, pca9538, pca9554,
-                       pca9556, pca9557, pca9574, tca6408
+                       pca9556, pca9557, pca9574, tca6408, xra1202
 
          16 bits:      max7312, max7313, pca9535, pca9539, pca9555, pca9575,
                        tca6416
 
+         24 bits:      tca6424
+
+         40 bits:      pca9505, pca9698
+
 config GPIO_PCA953X_IRQ
        bool "Interrupt controller support for PCA953x"
        depends on GPIO_PCA953X=y
@@ -630,7 +660,7 @@ comment "PCI GPIO expanders:"
 
 config GPIO_CS5535
        tristate "AMD CS5535/CS5536 GPIO support"
-       depends on PCI && X86 && MFD_CS5535
+       depends on 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
@@ -642,7 +672,7 @@ config GPIO_BT8XX
        tristate "BT8XX GPIO abuser"
        depends on PCI && VIDEO_BT848=n
        help
-         The BT8xx frame grabber chip has 24 GPIO pins than can be abused
+         The BT8xx frame grabber chip has 24 GPIO pins that can be abused
          as a cheap PCI GPIO card.
 
          This chip can be found on Miro, Hauppauge and STB TV-cards.