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 f06df076dc5284523044c727e792b4cdcdf62800..51336b2aedc92010d1c628d59b8131e9b423664c 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -114,20 +114,11 @@ config PINCTRL_LANTIQ
        select PINMUX
        select PINCONF
 
-config PINCTRL_PXA3xx
-       bool
-       select PINMUX
-
 config PINCTRL_FALCON
        bool
        depends on SOC_FALCON
        depends on PINCTRL_LANTIQ
 
-config PINCTRL_MMP2
-       bool "MMP2 pin controller driver"
-       depends on ARCH_MMP
-       select PINCTRL_PXA3xx
-
 config PINCTRL_MXS
        bool
        select PINMUX
@@ -159,21 +150,12 @@ config PINCTRL_DB8540
        bool "DB8540 pin controller driver"
        depends on PINCTRL_NOMADIK && ARCH_U8500
 
-config PINCTRL_PXA168
-       bool "PXA168 pin controller driver"
-       depends on ARCH_MMP
-       select PINCTRL_PXA3xx
-
-config PINCTRL_PXA910
-       bool "PXA910 pin controller driver"
-       depends on ARCH_MMP
-       select PINCTRL_PXA3xx
-
 config PINCTRL_SINGLE
        tristate "One-register-per-pin type device tree based pinctrl driver"
        depends on OF
        select PINMUX
        select PINCONF
+       select GENERIC_PINCONF
        help
          This selects the device tree based generic pinctrl driver.
 
@@ -234,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"