Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 5a8ad513931253766e976eb4dafff02480167b3c..b6e864e8c9e82df756fc6aa3d227a7e57627c1fa 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -61,7 +61,7 @@ config PINCTRL_AT91
 config PINCTRL_BAYTRAIL
        bool "Intel Baytrail GPIO pin control"
        depends on GPIOLIB && ACPI && X86
-        select IRQ_DOMAIN
+       select IRQ_DOMAIN
        help
          driver for memory mapped GPIO functionality on Intel Baytrail
          platforms. Supports 3 banks with 102, 28 and 44 gpios.
@@ -252,7 +252,7 @@ config PINCTRL_SAMSUNG
 
 config PINCTRL_EXYNOS
        bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
-       depends on OF && GPIOLIB && ARCH_EXYNOS
+       depends on OF && GPIOLIB && (ARCH_EXYNOS || ARCH_S5PV210)
        select PINCTRL_SAMSUNG
 
 config PINCTRL_EXYNOS5440
@@ -261,6 +261,17 @@ config PINCTRL_EXYNOS5440
        select PINMUX
        select PINCONF
 
+config PINCTRL_PALMAS
+       bool "Pinctrl driver for the PALMAS Series MFD devices"
+       depends on OF && MFD_PALMAS
+       select PINMUX
+       select GENERIC_PINCONF
+       help
+         Palmas device supports the configuration of pins for different
+         functionality. This driver supports the pinmux, push-pull and
+         open drain configuration for the Palmas series devices like
+         TPS65913, TPS80036 etc.
+
 config PINCTRL_S3C24XX
        bool "Samsung S3C24XX SoC pinctrl driver"
        depends on ARCH_S3C24XX