Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index b372419d61f26fbdf02dc82b31bf1d55c6b2bc4f..3bfbf2ff6e2bd58cb242e4891dd23d9192aa9cdc 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -32,15 +32,15 @@ config DEBUG_PINCTRL
          Say Y here to add some extra checks and diagnostics to PINCTRL calls.
 
 config PINCTRL_ARTPEC6
-        bool "Axis ARTPEC-6 pin controller driver"
-        depends on MACH_ARTPEC6
-        select PINMUX
-        select GENERIC_PINCONF
-        help
-          This is the driver for the Axis ARTPEC-6 pin controller. This driver
-          supports pin function multiplexing as well as pin bias and drive
-          strength configuration. Device tree integration instructions can be
-          found in Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
+       bool "Axis ARTPEC-6 pin controller driver"
+       depends on MACH_ARTPEC6
+       select PINMUX
+       select GENERIC_PINCONF
+       help
+         This is the driver for the Axis ARTPEC-6 pin controller. This driver
+         supports pin function multiplexing as well as pin bias and drive
+         strength configuration. Device tree integration instructions can be
+         found in Documentation/devicetree/bindings/pinctrl/axis,artpec6-pinctrl.txt
 
 config PINCTRL_AS3722
        tristate "Pinctrl and GPIO driver for ams AS3722 PMIC"
@@ -420,4 +420,22 @@ config PINCTRL_TB10X
        depends on OF && ARC_PLAT_TB10X
        select GPIOLIB
 
+config PINCTRL_EQUILIBRIUM
+       tristate "Generic pinctrl and GPIO driver for Intel Lightning Mountain SoC"
+       select PINMUX
+       select PINCONF
+       select GPIOLIB
+       select GPIO_GENERIC
+       select GPIOLIB_IRQCHIP
+       select GENERIC_PINCONF
+       select GENERIC_PINCTRL_GROUPS
+       select GENERIC_PINMUX_FUNCTIONS
+
+       help
+         Equilibrium pinctrl driver is a pinctrl & GPIO driver for Intel Lightning
+         Mountain network processor SoC that supports both the linux GPIO and pin
+         control frameworks. It provides interfaces to setup pinmux, assign desired
+         pin functions, configure GPIO attributes for LGM SoC pins. Pinmux and
+         pinconf settings are retrieved from device tree.
+
 endif