Merge tag 'edac_for_3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[linux-2.6-block.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index acdaa08b325c7660869a1984bb63d8b9bc599292..5a8ad513931253766e976eb4dafff02480167b3c 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -195,6 +195,12 @@ config PINCTRL_SUNXI
        select PINMUX
        select GENERIC_PINCONF
 
+config PINCTRL_ST
+       bool
+       depends on OF
+       select PINMUX
+       select PINCONF
+
 config PINCTRL_TEGRA
        bool
        select PINMUX
@@ -218,6 +224,12 @@ config PINCTRL_TZ1090
        select PINMUX
        select GENERIC_PINCONF
 
+config PINCTRL_TZ1090_PDC
+       bool "Toumaz Xenif TZ1090 PDC pin control driver"
+       depends on SOC_TZ1090
+       select PINMUX
+       select PINCONF
+
 config PINCTRL_U300
        bool "U300 pin controller driver"
        depends on ARCH_U300
@@ -239,15 +251,21 @@ config PINCTRL_SAMSUNG
        select PINCONF
 
 config PINCTRL_EXYNOS
-       bool "Pinctrl driver data for Samsung EXYNOS SoCs"
-       depends on OF && GPIOLIB
+       bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
+       depends on OF && GPIOLIB && ARCH_EXYNOS
        select PINCTRL_SAMSUNG
 
 config PINCTRL_EXYNOS5440
        bool "Samsung EXYNOS5440 SoC pinctrl driver"
+       depends on SOC_EXYNOS5440
        select PINMUX
        select PINCONF
 
+config PINCTRL_S3C24XX
+       bool "Samsung S3C24XX SoC pinctrl driver"
+       depends on ARCH_S3C24XX
+       select PINCTRL_SAMSUNG
+
 config PINCTRL_S3C64XX
        bool "Samsung S3C64XX SoC pinctrl driver"
        depends on ARCH_S3C64XX