diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:53:49 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:53:49 +0100 |
| commit | e7f274dccf7f18a58b86aa8cbd269cdfbdb08056 (patch) | |
| tree | 2881e777e8b77d5d970f34dfc456354ee8e797c4 /arch/arm/mach-mvebu/Kconfig | |
| parent | d4324ce357fa1b10447ebdfd01a681f12f39384f (diff) | |
| parent | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 (diff) | |
| download | linux-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.tar.gz linux-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.tar.bz2 linux-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.zip | |
Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc
Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:
- dove
- move devicetree code from mach-dove/ to mach-mvebu/ :-)
* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: move DT Dove to MVEBU
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index dd35de74efab..485513cb98c4 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -69,6 +69,18 @@ config MACH_ARMADA_XP Say 'Y' here if you want your kernel to support boards based on the Marvell Armada XP SoC with device tree. +config MACH_DOVE + bool "Marvell Dove boards" if ARCH_MULTI_V7 + select CACHE_L2X0 + select CPU_PJ4 + select DOVE_CLK + select ORION_IRQCHIP + select ORION_TIMER + select PINCTRL_DOVE + help + Say 'Y' here if you want your kernel to support the + Marvell Dove using flattened device tree. + config MACH_KIRKWOOD bool "Marvell Kirkwood boards" if ARCH_MULTI_V5 select ARCH_HAS_CPUFREQ |