Merge tag 'driver-core-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e5c122413843f96c6984275e9ffa158d29817ee8..48da857f4774829d2301559c7e69656bae636307 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -33,7 +33,6 @@ config ARCH_REQUIRE_GPIOLIB
 
 menuconfig GPIOLIB
        bool "GPIO Support"
-       depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB
        help
          This enables GPIO support through the generic GPIO library.
          You only need to enable this, if you also want to enable
@@ -49,7 +48,7 @@ config GPIO_DEVRES
 
 config OF_GPIO
        def_bool y
-       depends on OF
+       depends on OF || COMPILE_TEST
 
 config GPIO_ACPI
        def_bool y
@@ -122,6 +121,7 @@ config GPIO_ALTERA
 config GPIO_AMDPT
        tristate "AMD Promontory GPIO support"
        depends on ACPI
+       select GPIO_GENERIC
        help
          driver for GPIO functionality on Promontory IOHub
          Require ACPI ASL code to enumerate as a platform device.
@@ -303,6 +303,7 @@ config GPIO_MPC8XXX
                   FSL_SOC_BOOKE || PPC_86xx || ARCH_LAYERSCAPE || ARM || \
                   COMPILE_TEST
        select GPIO_GENERIC
+       select IRQ_DOMAIN
        help
          Say Y here if you're going to use hardware that connects to the
          MPC512x/831x/834x/837x/8572/8610/QorIQ GPIOs.
@@ -399,6 +400,11 @@ config GPIO_TB10X
        select GENERIC_IRQ_CHIP
        select OF_GPIO
 
+config GPIO_TEGRA
+       bool
+       default y
+       depends on ARCH_TEGRA || COMPILE_TEST
+
 config GPIO_TS4800
        tristate "TS-4800 DIO blocks and compatibles"
        depends on OF_GPIO
@@ -473,7 +479,7 @@ config GPIO_XILINX
 
 config GPIO_XLP
        tristate "Netlogic XLP GPIO support"
-       depends on CPU_XLP && OF_GPIO
+       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || COMPILE_TEST)
        select GPIOLIB_IRQCHIP
        help
          This driver provides support for GPIO interface on Netlogic XLP MIPS64
@@ -510,6 +516,13 @@ config GPIO_ZX
        help
          Say yes here to support the GPIO device on ZTE ZX SoCs.
 
+config GPIO_LOONGSON1
+       tristate "Loongson1 GPIO support"
+       depends on MACH_LOONGSON32
+       select GPIO_GENERIC
+       help
+         Say Y or M here to support GPIO on Loongson1 SoCs.
+
 endmenu
 
 menu "Port-mapped I/O GPIO drivers"
@@ -562,7 +575,7 @@ config GPIO_IT87
          Say yes here to support GPIO functionality of IT87xx Super I/O chips.
 
          This driver is tested with ITE IT8728 and IT8732 Super I/O chips, and
-         supports the IT8761E Super I/O chip as well.
+         supports the IT8761E, IT8620E and IT8628E Super I/O chip as well.
 
          To compile this driver as a module, choose M here: the module will
          be called gpio_it87
@@ -1097,6 +1110,7 @@ menu "SPI or I2C GPIO expanders"
 
 config GPIO_MCP23S08
        tristate "Microchip MCP23xxx I/O expander"
+       select GPIOLIB_IRQCHIP
        help
          SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017
          I/O expanders.