diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:02:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-16 00:56:18 +0100 |
| commit | 22ba14f41ca6b7f96fe3d4a8eb116358060595fd (patch) | |
| tree | fbc59ebf82556cd604b1946304c61e64c4469caf /drivers/clk/versatile/Kconfig | |
| parent | Merge branch 'versatile/multiplatform' into next/multiplatform (diff) | |
| parent | ARM: realview: add an DT SMP boot method (diff) | |
| download | linux-dev-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.tar.xz linux-dev-22ba14f41ca6b7f96fe3d4a8eb116358060595fd.zip | |
Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform
Merge "Realview multiplatform support" from Linus Walleij:
The board and infrastructure changes for RealView
multiplatform and extended DT support.
* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: add an DT SMP boot method
ARM: realview: select SP810 and ICST for the DT variant
soc: versatile: add support for the PB11MPCore
clk: versatile-icst: add device tree support
clk: versatile-icst: refactor to allocate regmap separately
clk: versatile-icst: convert to use regmap
ARM: realview: remove private barrier implementation
ARM: no longer force unbuffered DMA for realview
clk/realview: stop using machine headers
ARM: realview: don't map undefined PCI registers
ARM: realview: remove sparsemem hack
Conflicts:
drivers/clk/versatile/Kconfig
Diffstat (limited to 'drivers/clk/versatile/Kconfig')
| -rw-r--r-- | drivers/clk/versatile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/versatile/Kconfig b/drivers/clk/versatile/Kconfig index 369a2dc50f74..a6da2aa09f83 100644 --- a/drivers/clk/versatile/Kconfig +++ b/drivers/clk/versatile/Kconfig @@ -3,6 +3,7 @@ config COMMON_CLK_VERSATILE depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \ ARCH_VERSATILE || ARCH_VEXPRESS || ARM64 || \ COMPILE_TEST + select REGMAP_MMIO ---help--- Supports clocking on ARM Reference designs: - Integrator/AP and Integrator/CP |