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

[mirror_ubuntu-bionic-kernel.git] / drivers / gpio / Kconfig

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 3f80f167ed56d917405aaad1dd5e09598c7fc9e6..29fc154232995025cbed2dc5251029826600367a 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -139,7 +139,7 @@ config GPIO_BRCMSTB
        default y if (ARCH_BRCMSTB || BMIPS_GENERIC)
        depends on OF_GPIO && (ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST)
        select GPIO_GENERIC
-       select GPIOLIB_IRQCHIP
+       select IRQ_DOMAIN
        help
          Say yes here to enable GPIO support for Broadcom STB (BCM7XXX) SoCs.
 
@@ -286,8 +286,7 @@ config GPIO_LYNXPOINT
          Requires ACPI device enumeration code to set up a platform device.
 
 config GPIO_MB86S7X
-       bool "GPIO support for Fujitsu MB86S7x Platforms"
-       depends on ARCH_MB86S7X || COMPILE_TEST
+       tristate "GPIO support for Fujitsu MB86S7x Platforms"
        help
          Say yes here to support the GPIO controller in Fujitsu MB86S70 SoCs.
 
@@ -442,6 +441,15 @@ config GPIO_TEGRA
        help
          Say yes here to support GPIO pins on NVIDIA Tegra SoCs.
 
+config GPIO_TEGRA186
+       tristate "NVIDIA Tegra186 GPIO support"
+       default ARCH_TEGRA_186_SOC
+       depends on ARCH_TEGRA_186_SOC || COMPILE_TEST
+       depends on OF_GPIO
+       select GPIOLIB_IRQCHIP
+       help
+         Say yes here to support GPIO pins on NVIDIA Tegra186 SoCs.
+
 config GPIO_TS4800
        tristate "TS-4800 DIO blocks and compatibles"
        depends on OF_GPIO
@@ -475,6 +483,14 @@ config GPIO_TZ1090_PDC
        help
          Say yes here to support Toumaz Xenif TZ1090 PDC GPIOs.
 
+config GPIO_UNIPHIER
+       tristate "UniPhier GPIO support"
+       depends on ARCH_UNIPHIER || COMPILE_TEST
+       depends on OF_GPIO
+       select IRQ_DOMAIN_HIERARCHY
+       help
+         Say yes here to support UniPhier GPIOs.
+
 config GPIO_VF610
        def_bool y
        depends on ARCH_MXC && SOC_VF610
@@ -1256,6 +1272,16 @@ config GPIO_74X164
          shift registers. This driver can be used to provide access
          to more gpio outputs.
 
+config GPIO_MAX3191X
+       tristate "Maxim MAX3191x industrial serializer"
+       select CRC8
+       help
+         GPIO driver for Maxim MAX31910, MAX31911, MAX31912, MAX31913,
+         MAX31953 and MAX31963 industrial serializer, a daisy-chainable
+         chip to make 8 digital 24V inputs available via SPI.  Supports
+         CRC checksums to guard against electromagnetic interference,
+         as well as undervoltage and overtemperature detection.
+
 config GPIO_MAX7301
        tristate "Maxim MAX7301 GPIO expander"
        select GPIO_MAX730X