summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-berlin
diff options
context:
space:
mode:
authorAntoine Ténart <antoine.tenart@free-electrons.com>2014-09-03 09:48:22 +0200
committerSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-10-21 11:35:15 +0200
commite9246c8726312aae36202b9e50c7e76a8609b712 (patch)
treef78a921877fcec828e18a7471b3a3c9bb1ff123a /arch/arm/mach-berlin
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
downloadlinux-e9246c8726312aae36202b9e50c7e76a8609b712.tar.bz2
ARM: Berlin: select the reset controller
The Marvell Berlin SoCs now has a reset controller. Add the needed configuration. While at it reorder Kconfigs alphabetically. Signed-off-by: Antoine Ténart <antoine.tenart@free-electrons.com> Signed-off-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, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 24f85be71671..84d34e07209c 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