Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index ab7225e471ab655d7f71281a75ddcb7b4d87adfa..51336b2aedc92010d1c628d59b8131e9b423664c 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -93,12 +93,20 @@ config PINCTRL_IMX53
          Say Y here to enable the imx53 pinctrl driver
 
 config PINCTRL_IMX6Q
-       bool "IMX6Q pinctrl driver"
+       bool "IMX6Q/DL pinctrl driver"
        depends on OF
        depends on SOC_IMX6Q
        select PINCTRL_IMX
        help
-         Say Y here to enable the imx6q pinctrl driver
+         Say Y here to enable the imx6q/dl pinctrl driver
+
+config PINCTRL_IMX6SL
+       bool "IMX6SL pinctrl driver"
+       depends on OF
+       depends on SOC_IMX6SL
+       select PINCTRL_IMX
+       help
+         Say Y here to enable the imx6sl pinctrl driver
 
 config PINCTRL_LANTIQ
        bool
@@ -208,6 +216,11 @@ config PINCTRL_EXYNOS5440
        select PINMUX
        select PINCONF
 
+config PINCTRL_S3C64XX
+       bool "Samsung S3C64XX SoC pinctrl driver"
+       depends on ARCH_S3C64XX
+       select PINCTRL_SAMSUNG
+
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/sh-pfc/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"