Merge tag 's390-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index f57d95a3db02622835f0a3c1699bda71d08950e3..b8013cf90064d50523ff6a0791abf6769e249522 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -312,6 +312,12 @@ config GPIO_IXP4XX
          IXP4xx series of chips.
 
          If unsure, say N.
+config GPIO_LOGICVC
+       tristate "Xylon LogiCVC GPIO support"
+       depends on MFD_SYSCON && OF
+       help
+         Say yes here to support GPIO functionality of the Xylon LogiCVC
+         programmable logic block.
 
 config GPIO_LOONGSON
        bool "Loongson-2/3 GPIO support"
@@ -335,14 +341,6 @@ config GPIO_LPC32XX
          Select this option to enable GPIO driver for
          NXP LPC32XX devices.
 
-config GPIO_LYNXPOINT
-       tristate "Intel Lynxpoint GPIO support"
-       depends on ACPI && X86
-       select GPIOLIB_IRQCHIP
-       help
-         driver for GPIO functionality on Intel Lynxpoint PCH chipset
-         Requires ACPI device enumeration code to set up a platform device.
-
 config GPIO_MB86S7X
        tristate "GPIO support for Fujitsu MB86S7x Platforms"
        help
@@ -582,6 +580,7 @@ config GPIO_THUNDERX
        tristate "Cavium ThunderX/OCTEON-TX GPIO"
        depends on ARCH_THUNDER || (64BIT && COMPILE_TEST)
        depends on PCI_MSI
+       select GPIOLIB_IRQCHIP
        select IRQ_DOMAIN_HIERARCHY
        select IRQ_FASTEOI_HIERARCHY_HANDLERS
        help
@@ -621,6 +620,13 @@ config GPIO_VX855
          additional drivers must be enabled in order to use the
          functionality of the device.
 
+config GPIO_WCD934X
+       tristate "Qualcomm Technologies Inc WCD9340/WCD9341 gpio controller driver"
+       depends on MFD_WCD934X && OF_GPIO
+       help
+         This driver is to supprot GPIO block found on the Qualcomm Technologies
+        Inc WCD9340/WCD9341 Audio Codec.
+
 config GPIO_XGENE
        bool "APM X-Gene GPIO controller support"
        depends on ARM64 && OF_GPIO
@@ -1029,6 +1035,18 @@ config GPIO_BD70528
          This driver can also be built as a module. If so, the module
          will be called gpio-bd70528.
 
+config GPIO_BD71828
+       tristate "ROHM BD71828 GPIO support"
+       depends on MFD_ROHM_BD71828
+       help
+         Support for GPIOs on ROHM BD71828 PMIC. There are three GPIOs
+         available on the ROHM PMIC in total. The GPIOs are limited to
+         outputs only and pins must be configured to GPIO outputs by
+         OTP. Enable this only if you want to use these pins as outputs.
+
+         This driver can also be built as a module. If so, the module
+         will be called gpio-bd71828.
+
 config GPIO_BD9571MWV
        tristate "ROHM BD9571 GPIO support"
        depends on MFD_BD9571MWV