Merge tag 'mfd-next-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-2.6-block.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 2764d713fea8b37928d44110d3894e12f3e3eff3..ea798548b0125d20b696f2dbeac99d6ef48031fc 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -108,6 +108,14 @@ config PINCTRL_AMD
          Requires ACPI/FDT device enumeration code to set up a platform
          device.
 
+config PINCTRL_BM1880
+       bool "Bitmain BM1880 Pinctrl driver"
+       depends on OF && (ARCH_BITMAIN || COMPILE_TEST)
+       default ARCH_BITMAIN
+       select PINMUX
+       help
+         Pinctrl driver for Bitmain BM1880 SoC.
+
 config PINCTRL_DA850_PUPD
        tristate "TI DA850/OMAP-L138/AM18XX pullup/pulldown groups"
        depends on OF && (ARCH_DAVINCI_DA850 || COMPILE_TEST)
@@ -265,6 +273,20 @@ config PINCTRL_ST
        select PINCONF
        select GPIOLIB_IRQCHIP
 
+config PINCTRL_STMFX
+       tristate "STMicroelectronics STMFX GPIO expander pinctrl driver"
+       depends on I2C
+       depends on OF || COMPILE_TEST
+       select GENERIC_PINCONF
+       select GPIOLIB_IRQCHIP
+       select MFD_STMFX
+       help
+         Driver for STMicroelectronics Multi-Function eXpander (STMFX)
+         GPIO expander.
+         This provides a GPIO interface supporting inputs and outputs,
+         and configuring push-pull, open-drain, and can also be used as
+         interrupt-controller.
+
 config PINCTRL_U300
        bool "U300 pin controller driver"
        depends on ARCH_U300