From: Antoine Ténart <antoine.tenart@free-electrons.com>
Date: Wed, 3 Sep 2014 07:48:22 +0000 (+0200)
Subject: ARM: Berlin: select the reset controller
X-Git-Tag: firefly_0821_release~176^2~2768^2~11^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e9246c8726312aae36202b9e50c7e76a8609b712;p=firefly-linux-kernel-4.4.55.git

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>
---

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