aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/Kconfig
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2013-06-10 05:26:53 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-06-18 14:41:37 -0400
commit83978253d0c3e12bf81d4b5f419a0200d5cb19a6 (patch)
tree37fd53079a63f212b2cb8a924afccc986e3c1992 /arch/arm/mach-exynos/Kconfig
parent0240d562d0b11e369e3e4af6fe8e6c607bc35d4c (diff)
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>
Diffstat (limited to 'arch/arm/mach-exynos/Kconfig')
-rw-r--r--arch/arm/mach-exynos/Kconfig9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 6aa228da2d88..e51d99060d33 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -17,6 +17,7 @@ config ARCH_EXYNOS4
17 select HAVE_ARM_SCU if SMP 17 select HAVE_ARM_SCU if SMP
18 select HAVE_SMP 18 select HAVE_SMP
19 select MIGHT_HAVE_CACHE_L2X0 19 select MIGHT_HAVE_CACHE_L2X0
20 select PINCTRL
20 help 21 help
21 Samsung EXYNOS4 SoCs based systems 22 Samsung EXYNOS4 SoCs based systems
22 23
@@ -24,6 +25,7 @@ config ARCH_EXYNOS5
24 bool "SAMSUNG EXYNOS5" 25 bool "SAMSUNG EXYNOS5"
25 select HAVE_ARM_SCU if SMP 26 select HAVE_ARM_SCU if SMP
26 select HAVE_SMP 27 select HAVE_SMP
28 select PINCTRL
27 help 29 help
28 Samsung EXYNOS5 (Cortex-A15) SoC based systems 30 Samsung EXYNOS5 (Cortex-A15) SoC based systems
29 31
@@ -34,6 +36,7 @@ config CPU_EXYNOS4210
34 default y 36 default y
35 depends on ARCH_EXYNOS4 37 depends on ARCH_EXYNOS4
36 select ARM_CPU_SUSPEND if PM 38 select ARM_CPU_SUSPEND if PM
39 select PINCTRL_EXYNOS
37 select PM_GENERIC_DOMAINS 40 select PM_GENERIC_DOMAINS
38 select S5P_PM if PM 41 select S5P_PM if PM
39 select S5P_SLEEP if PM 42 select S5P_SLEEP if PM
@@ -45,6 +48,7 @@ config SOC_EXYNOS4212
45 bool "SAMSUNG EXYNOS4212" 48 bool "SAMSUNG EXYNOS4212"
46 default y 49 default y
47 depends on ARCH_EXYNOS4 50 depends on ARCH_EXYNOS4
51 select PINCTRL_EXYNOS
48 select S5P_PM if PM 52 select S5P_PM if PM
49 select S5P_SLEEP if PM 53 select S5P_SLEEP if PM
50 select SAMSUNG_DMADEV 54 select SAMSUNG_DMADEV
@@ -55,6 +59,7 @@ config SOC_EXYNOS4412
55 bool "SAMSUNG EXYNOS4412" 59 bool "SAMSUNG EXYNOS4412"
56 default y 60 default y
57 depends on ARCH_EXYNOS4 61 depends on ARCH_EXYNOS4
62 select PINCTRL_EXYNOS
58 select SAMSUNG_DMADEV 63 select SAMSUNG_DMADEV
59 help 64 help
60 Enable EXYNOS4412 SoC support 65 Enable EXYNOS4412 SoC support
@@ -63,6 +68,7 @@ config SOC_EXYNOS5250
63 bool "SAMSUNG EXYNOS5250" 68 bool "SAMSUNG EXYNOS5250"
64 default y 69 default y
65 depends on ARCH_EXYNOS5 70 depends on ARCH_EXYNOS5
71 select PINCTRL_EXYNOS
66 select PM_GENERIC_DOMAINS if PM 72 select PM_GENERIC_DOMAINS if PM
67 select S5P_PM if PM 73 select S5P_PM if PM
68 select S5P_SLEEP if PM 74 select S5P_SLEEP if PM
@@ -78,7 +84,6 @@ config SOC_EXYNOS5440
78 select ARCH_HAS_OPP 84 select ARCH_HAS_OPP
79 select ARM_ARCH_TIMER 85 select ARM_ARCH_TIMER
80 select AUTO_ZRELADDR 86 select AUTO_ZRELADDR
81 select PINCTRL
82 select PINCTRL_EXYNOS5440 87 select PINCTRL_EXYNOS5440
83 select PM_OPP 88 select PM_OPP
84 help 89 help
@@ -413,8 +418,6 @@ config MACH_EXYNOS4_DT
413 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 418 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
414 select CPU_EXYNOS4210 419 select CPU_EXYNOS4210
415 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD 420 select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
416 select PINCTRL
417 select PINCTRL_EXYNOS
418 select S5P_DEV_MFC 421 select S5P_DEV_MFC
419 select USE_OF 422 select USE_OF
420 help 423 help