summaryrefslogtreecommitdiff
path: root/arch/arm/mach-berlin/Kconfig
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-06-24 21:32:26 -0700
committerKevin Hilman <khilman@linaro.org>2015-06-24 21:32:26 -0700
commit32270e805a1e0baf39aa040177ef1896f03b7266 (patch)
tree89f8ac72b98d4f37377fa58f3fa9804dd32f2350 /arch/arm/mach-berlin/Kconfig
parent39e79b873e1bafc5637a1a704495b01edbe469b1 (diff)
parent4af34b572a85c44c55491a10693535a79627c478 (diff)
Merge tag 'armsoc-drivers' into test-merge
ARM: SoC: driver updates for v4.2 Some of these are for drivers/soc, where we're now putting SoC-specific drivers these days. Some are for other driver subsystems where we have received acks from the appropriate maintainers. Some highlights: - simple-mfd: document DT bindings and misc updates - migrate mach-berlin to simple-mfd for clock, pinctrl and reset - memory: support for Tegra132 SoC - memory: introduce tegra EMC driver for scaling memory frequency - misc. updates for ARM CCI and CCN busses Conflicts: arch/arm64/boot/dts/arm/juno-motherboard.dtsi Trivial add/add conflict with our dt branch. Resolution: take both sides. # gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>" # Conflicts: # arch/arm64/boot/dts/arm/juno-motherboard.dtsi
Diffstat (limited to 'arch/arm/mach-berlin/Kconfig')
-rw-r--r--arch/arm/mach-berlin/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 3e40a947f3ea..742d53a5f7f9 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -6,6 +6,7 @@ menuconfig ARCH_BERLIN
select DW_APB_ICTL
select DW_APB_TIMER_OF
select GENERIC_IRQ_CHIP
+ select MFD_SYSCON
select PINCTRL
if ARCH_BERLIN