ARM: EXYNOS: Select PINCTRL_EXYNOS for exynos4/5 at chip level

Previously if you had MACH_EXYNOS5_DT but not MACH_EXYNOS4_DT you'd be
missing the pincontrol definitions.  Move PINCTRL selects to the arch
level since we should be enabling the code for all exynos variants.

Update the PINCTRL descriptions to indicate that PINCTRL_EXYNOS is not
for exynos5440.  Also add basic dependencies for the PINCTRL_EXYNOS
kernel config.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 6aa228da2d88d0ecd3ff5c181eccc000ae025bd8..e51d99060d33d7965d14867dc38f3344df50fbc5 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -17,6 +17,7 @@ config ARCH_EXYNOS4
        select HAVE_ARM_SCU if SMP
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
+       select PINCTRL
        help
          Samsung EXYNOS4 SoCs based systems
 
@@ -24,6 +25,7 @@ config ARCH_EXYNOS5
        bool "SAMSUNG EXYNOS5"
        select HAVE_ARM_SCU if SMP
        select HAVE_SMP
+       select PINCTRL
        help
          Samsung EXYNOS5 (Cortex-A15) SoC based systems
 
@@ -34,6 +36,7 @@ config CPU_EXYNOS4210
        default y
        depends on ARCH_EXYNOS4
        select ARM_CPU_SUSPEND if PM
+       select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS
        select S5P_PM if PM
        select S5P_SLEEP if PM
@@ -45,6 +48,7 @@ config SOC_EXYNOS4212
        bool "SAMSUNG EXYNOS4212"
        default y
        depends on ARCH_EXYNOS4
+       select PINCTRL_EXYNOS
        select S5P_PM if PM
        select S5P_SLEEP if PM
        select SAMSUNG_DMADEV
@@ -55,6 +59,7 @@ config SOC_EXYNOS4412
        bool "SAMSUNG EXYNOS4412"
        default y
        depends on ARCH_EXYNOS4
+       select PINCTRL_EXYNOS
        select SAMSUNG_DMADEV
        help
          Enable EXYNOS4412 SoC support
@@ -63,6 +68,7 @@ config SOC_EXYNOS5250
        bool "SAMSUNG EXYNOS5250"
        default y
        depends on ARCH_EXYNOS5
+       select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM
        select S5P_PM if PM
        select S5P_SLEEP if PM
@@ -78,7 +84,6 @@ config SOC_EXYNOS5440
        select ARCH_HAS_OPP
        select ARM_ARCH_TIMER
        select AUTO_ZRELADDR
-       select PINCTRL
        select PINCTRL_EXYNOS5440
        select PM_OPP
        help
@@ -413,8 +418,6 @@ config MACH_EXYNOS4_DT
        select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
        select CPU_EXYNOS4210
        select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
-       select PINCTRL
-       select PINCTRL_EXYNOS
        select S5P_DEV_MFC
        select USE_OF
        help

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 8f669243814935c3df4544e8d61127997cde2332..a1c6dd32e14b279b8c4f5bfba43e78a1d76515a5 100644 (file)
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -207,12 +207,13 @@ 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