Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c65189 authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents e7638e7a e9246c87

arch/arm/mach-berlin/Kconfig

+3 −1
Original line number Diff line number Diff line 
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