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

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

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index f910962baaa7d32c3996b814bd77c3656fc3d314..8f669243814935c3df4544e8d61127997cde2332 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
@@ -216,6 +224,7 @@ config PINCTRL_S3C64XX
 source "drivers/pinctrl/mvebu/Kconfig"
 source "drivers/pinctrl/sh-pfc/Kconfig"
 source "drivers/pinctrl/spear/Kconfig"
+source "drivers/pinctrl/vt8500/Kconfig"
 
 config PINCTRL_XWAY
        bool