Commit 83978253 authored by Doug Anderson's avatar Doug Anderson Committed by Kukjin Kim

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: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 0240d562
...@@ -17,6 +17,7 @@ config ARCH_EXYNOS4 ...@@ -17,6 +17,7 @@ config ARCH_EXYNOS4
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_SMP select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select PINCTRL
help help
Samsung EXYNOS4 SoCs based systems Samsung EXYNOS4 SoCs based systems
...@@ -24,6 +25,7 @@ config ARCH_EXYNOS5 ...@@ -24,6 +25,7 @@ config ARCH_EXYNOS5
bool "SAMSUNG EXYNOS5" bool "SAMSUNG EXYNOS5"
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_SMP select HAVE_SMP
select PINCTRL
help help
Samsung EXYNOS5 (Cortex-A15) SoC based systems Samsung EXYNOS5 (Cortex-A15) SoC based systems
...@@ -34,6 +36,7 @@ config CPU_EXYNOS4210 ...@@ -34,6 +36,7 @@ config CPU_EXYNOS4210
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS select PM_GENERIC_DOMAINS
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
...@@ -45,6 +48,7 @@ config SOC_EXYNOS4212 ...@@ -45,6 +48,7 @@ config SOC_EXYNOS4212
bool "SAMSUNG EXYNOS4212" bool "SAMSUNG EXYNOS4212"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select PINCTRL_EXYNOS
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
...@@ -55,6 +59,7 @@ config SOC_EXYNOS4412 ...@@ -55,6 +59,7 @@ config SOC_EXYNOS4412
bool "SAMSUNG EXYNOS4412" bool "SAMSUNG EXYNOS4412"
default y default y
depends on ARCH_EXYNOS4 depends on ARCH_EXYNOS4
select PINCTRL_EXYNOS
select SAMSUNG_DMADEV select SAMSUNG_DMADEV
help help
Enable EXYNOS4412 SoC support Enable EXYNOS4412 SoC support
...@@ -63,6 +68,7 @@ config SOC_EXYNOS5250 ...@@ -63,6 +68,7 @@ config SOC_EXYNOS5250
bool "SAMSUNG EXYNOS5250" bool "SAMSUNG EXYNOS5250"
default y default y
depends on ARCH_EXYNOS5 depends on ARCH_EXYNOS5
select PINCTRL_EXYNOS
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
select S5P_PM if PM select S5P_PM if PM
select S5P_SLEEP if PM select S5P_SLEEP if PM
...@@ -78,7 +84,6 @@ config SOC_EXYNOS5440 ...@@ -78,7 +84,6 @@ config SOC_EXYNOS5440
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARM_ARCH_TIMER select ARM_ARCH_TIMER
select AUTO_ZRELADDR select AUTO_ZRELADDR
select PINCTRL
select PINCTRL_EXYNOS5440 select PINCTRL_EXYNOS5440
select PM_OPP select PM_OPP
help help
...@@ -413,8 +418,6 @@ config MACH_EXYNOS4_DT ...@@ -413,8 +418,6 @@ config MACH_EXYNOS4_DT
select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210 select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
select CPU_EXYNOS4210 select CPU_EXYNOS4210
select KEYBOARD_SAMSUNG if INPUT_KEYBOARD select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
select PINCTRL
select PINCTRL_EXYNOS
select S5P_DEV_MFC select S5P_DEV_MFC
select USE_OF select USE_OF
help help
......
...@@ -207,12 +207,13 @@ config PINCTRL_SAMSUNG ...@@ -207,12 +207,13 @@ config PINCTRL_SAMSUNG
select PINCONF select PINCONF
config PINCTRL_EXYNOS config PINCTRL_EXYNOS
bool "Pinctrl driver data for Samsung EXYNOS SoCs" bool "Pinctrl driver data for Samsung EXYNOS SoCs other than 5440"
depends on OF && GPIOLIB depends on OF && GPIOLIB && ARCH_EXYNOS
select PINCTRL_SAMSUNG select PINCTRL_SAMSUNG
config PINCTRL_EXYNOS5440 config PINCTRL_EXYNOS5440
bool "Samsung EXYNOS5440 SoC pinctrl driver" bool "Samsung EXYNOS5440 SoC pinctrl driver"
depends on SOC_EXYNOS5440
select PINMUX select PINMUX
select PINCONF select PINCONF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment