diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-08 16:46:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-08 16:46:36 -0800 |
| commit | c6c65189f9e14338533c871845ae6897a4f87c88 (patch) | |
| tree | 365ee070e16368f14b75160b5b437ceaf3136a3c /arch | |
| parent | e7638e7a495b99468f7964b4ff65efe97a277c0c (diff) | |
| parent | e9246c8726312aae36202b9e50c7e76a8609b712 (diff) | |
Merge tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/soc
Merge "ARM: berlin: SoC changes for v3.19 (round 1)" from Sebastian
Hesselbarth:
Berlin SoC changes for v3.19 (round 1)
- Select the reset driver for all SoCs
* tag 'berlin-soc-3.19-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: Berlin: select the reset controller
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-berlin/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig index 24f85be7167..84d34e07209 100644 --- a/arch/arm/mach-berlin/Kconfig +++ b/arch/arm/mach-berlin/Kconfig @@ -1,11 +1,13 @@ menuconfig ARCH_BERLIN bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 + select ARCH_HAS_RESET_CONTROLLER select ARCH_REQUIRE_GPIOLIB select ARM_GIC - select GENERIC_IRQ_CHIP select DW_APB_ICTL select DW_APB_TIMER_OF + select GENERIC_IRQ_CHIP select PINCTRL + select RESET_CONTROLLER if ARCH_BERLIN |