aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-berlin
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2014-05-18 20:06:32 +0200
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-05-19 22:52:39 +0200
commit03dac26a831c51e544dc95ba12ea9e3520829e7e (patch)
treece4c7693018a25cac3fa2901b24f52e89f1c1e81 /arch/arm/mach-berlin
parentd45fa871c06762ab7e10ea4d889ab5be61d41ab1 (diff)
downloadlinux-linaro-stable-03dac26a831c51e544dc95ba12ea9e3520829e7e.tar.gz
ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Diffstat (limited to 'arch/arm/mach-berlin')
-rw-r--r--arch/arm/mach-berlin/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 95c098f497b5..101e0f356730 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -5,6 +5,7 @@ config ARCH_BERLIN
select GENERIC_IRQ_CHIP
select DW_APB_ICTL
select DW_APB_TIMER_OF
+ select PINCTRL
if ARCH_BERLIN
@@ -15,16 +16,19 @@ config MACH_BERLIN_BG2
select CACHE_L2X0
select CPU_PJ4B
select HAVE_ARM_TWD if SMP
+ select PINCTRL_BERLIN_BG2
config MACH_BERLIN_BG2CD
bool "Marvell Armada 1500-mini (BG2CD)"
select CACHE_L2X0
select HAVE_ARM_TWD if SMP
+ select PINCTRL_BERLIN_BG2CD
config MACH_BERLIN_BG2Q
bool "Marvell Armada 1500 Pro (BG2-Q)"
select CACHE_L2X0
select HAVE_ARM_TWD if SMP
+ select PINCTRL_BERLIN_BG2Q
endmenu