diff options
| author | Antoine Tenart <antoine.tenart@free-electrons.com> | 2014-05-18 20:06:32 +0200 |
|---|---|---|
| committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-05-19 22:52:39 +0200 |
| commit | 03dac26a831c51e544dc95ba12ea9e3520829e7e (patch) | |
| tree | ce4c7693018a25cac3fa2901b24f52e89f1c1e81 /arch/arm/mach-berlin | |
| parent | d45fa871c06762ab7e10ea4d889ab5be61d41ab1 (diff) | |
| download | linux-stable-03dac26a831c51e544dc95ba12ea9e3520829e7e.tar.gz linux-stable-03dac26a831c51e544dc95ba12ea9e3520829e7e.tar.bz2 linux-stable-03dac26a831c51e544dc95ba12ea9e3520829e7e.zip | |
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/Kconfig | 4 |
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 |