From: Antoine Tenart Date: Sun, 18 May 2014 18:06:32 +0000 (+0200) Subject: ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=03dac26a831c51e544dc95ba12ea9e3520829e7e;p=linux-beck.git ARM: berlin: add the pinctrl dependency for the Marvell Berlin SoCs Signed-off-by: Antoine Tenart Acked-by: Sebastian Hesselbarth --- 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