Merge tag 'gpio-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[cascardo/linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d786061..98dd47a 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -250,7 +250,7 @@ config GPIO_LOONGSON
          driver for GPIO functionality on Loongson-2F/3A/3B processors.
 
 config GPIO_LPC18XX
-       bool "NXP LPC18XX/43XX GPIO support"
+       tristate "NXP LPC18XX/43XX GPIO support"
        default y if ARCH_LPC18XX
        depends on OF_GPIO && (ARCH_LPC18XX || COMPILE_TEST)
        help
@@ -874,6 +874,15 @@ config GPIO_LP3943
          LP3943 can be used as a GPIO expander which provides up to 16 GPIOs.
          Open drain outputs are required for this usage.
 
+config GPIO_MAX77620
+       tristate "GPIO support for PMIC MAX77620 and MAX20024"
+       depends on MFD_MAX77620
+       help
+         GPIO driver for MAX77620 and MAX20024 PMIC from Maxim Semiconductor.
+         MAX77620 PMIC has 8 pins that can be configured as GPIOs. The
+         driver also provides interrupt support for each of the gpios.
+         Say yes here to enable the max77620 to be used as gpio controller.
+
 config GPIO_MSIC
        bool "Intel MSIC mixed signal gpio support"
        depends on MFD_INTEL_MSIC
@@ -1029,11 +1038,18 @@ config GPIO_BT8XX
          If unsure, say N.
 
 config GPIO_INTEL_MID
-       bool "Intel Mid GPIO support"
-       depends on X86
+       bool "Intel MID GPIO support"
+       depends on X86_INTEL_MID
+       select GPIOLIB_IRQCHIP
+       help
+         Say Y here to support Intel MID GPIO.
+
+config GPIO_MERRIFIELD
+       tristate "Intel Merrifield GPIO support"
+       depends on X86_INTEL_MID
        select GPIOLIB_IRQCHIP
        help
-         Say Y here to support Intel Mid GPIO.
+         Say Y here to support Intel Merrifield GPIO.
 
 config GPIO_ML_IOH
        tristate "OKI SEMICONDUCTOR ML7213 IOH GPIO support"