Merge branch 'at91' into devel

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / pinctrl / Kconfig

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 4787f0e..6d5a50b 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -152,8 +152,8 @@ config PINCTRL_SINGLE
          This selects the device tree based generic pinctrl driver.
 
 config PINCTRL_SIRF
-       bool "CSR SiRFprimaII pin controller driver"
-       depends on ARCH_PRIMA2
+       bool "CSR SiRFprimaII/SiRFmarco pin controller driver"
+       depends on ARCH_SIRF
        select PINMUX
 
 config PINCTRL_TEGRA
@@ -188,34 +188,16 @@ config PINCTRL_COH901
 
 config PINCTRL_SAMSUNG
        bool "Samsung pinctrl driver"
+       depends on OF && GPIOLIB
        select PINMUX
        select PINCONF
 
 config PINCTRL_EXYNOS4
        bool "Pinctrl driver data for Exynos4 SoC"
+       depends on OF && GPIOLIB
        select PINCTRL_SAMSUNG
 
-config PINCTRL_MVEBU
-       bool
-       depends on ARCH_MVEBU
-       select PINMUX
-       select PINCONF
-
-config PINCTRL_DOVE
-       bool
-       select PINCTRL_MVEBU
-
-config PINCTRL_KIRKWOOD
-       bool
-       select PINCTRL_MVEBU
-
-config PINCTRL_ARMADA_370
-       bool
-       select PINCTRL_MVEBU
-
-config PINCTRL_ARMADA_XP
-       bool
-       select PINCTRL_MVEBU
+source "drivers/pinctrl/mvebu/Kconfig"
 
 source "drivers/pinctrl/spear/Kconfig"