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

[sfrench/cifs-2.6.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 395c85df48fd814d00c65239e7314b2132d752db..f235eae04c16ed1096689329c0462df74e05a36d 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -337,9 +337,10 @@ config GPIO_MPC8XXX
 
 config GPIO_MVEBU
        def_bool y
-       depends on PLAT_ORION
+       depends on PLAT_ORION || ARCH_MVEBU
        depends on OF_GPIO
        select GENERIC_IRQ_CHIP
+       select REGMAP_MMIO
 
 config GPIO_MXC
        def_bool y
@@ -515,12 +516,13 @@ config GPIO_XILINX
 
 config GPIO_XLP
        tristate "Netlogic XLP GPIO support"
-       depends on OF_GPIO && (CPU_XLP || ARCH_VULCAN || ARCH_THUNDER2 || COMPILE_TEST)
+       depends on OF_GPIO && (CPU_XLP || ARCH_THUNDER2 || COMPILE_TEST)
        select GPIOLIB_IRQCHIP
        help
          This driver provides support for GPIO interface on Netlogic XLP MIPS64
          SoCs. Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX,
-         XLP9XX and XLP5XX.
+         XLP9XX and XLP5XX. The same GPIO controller block is also present in
+         Cavium's ThunderX2 CN99XX SoCs.
 
          If unsure, say N.
 
@@ -963,6 +965,16 @@ config GPIO_LP873X
          This driver can also be built as a module. If so, the module will be
           called gpio-lp873x.
 
+config GPIO_LP87565
+       tristate "TI LP87565 GPIO"
+       depends on MFD_TI_LP87565
+       help
+         This driver supports the GPIO on TI Lp873565 PMICs. 3 GPIOs are present
+         on LP87565 PMICs.
+
+         This driver can also be built as a module. If so, the module will be
+         called gpio-lp87565.
+
 config GPIO_MAX77620
        tristate "GPIO support for PMIC MAX77620 and MAX20024"
        depends on MFD_MAX77620
@@ -1236,6 +1248,12 @@ config GPIO_PISOSR
          GPIO driver for SPI compatible parallel-in/serial-out shift
          registers. These are input only devices.
 
+config GPIO_XRA1403
+       tristate "EXAR XRA1403 16-bit GPIO expander"
+       select REGMAP_SPI
+       help
+         GPIO driver for EXAR XRA1403 16-bit SPI-based GPIO expander.
+
 endmenu
 
 menu "USB GPIO expanders"