diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-03-01 09:39:38 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-03-04 04:13:48 +0000 |
| commit | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 (patch) | |
| tree | a4d25fdc037d6996c3fa268994b4c0bdbb530969 /arch/arm/mach-dove | |
| parent | 0d75ab68fd1a516f7a394fac6ba0f0ef34bbd18e (diff) | |
| download | linux-stable-00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535.tar.gz linux-stable-00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535.tar.bz2 linux-stable-00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535.zip | |
ARM: mvebu: move DT Dove to MVEBU
With all the DT support preparation done, we are able to move Dove
to MVEBU easily. Legacy non-DT mach-dove is left untouched to rot
for a while before removal.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/mach-dove')
| -rw-r--r-- | arch/arm/mach-dove/Kconfig | 12 | ||||
| -rw-r--r-- | arch/arm/mach-dove/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-dove/board-dt.c | 43 |
3 files changed, 0 insertions, 56 deletions
diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig index 0bc7cdf8cf46..d8c439c89ea9 100644 --- a/arch/arm/mach-dove/Kconfig +++ b/arch/arm/mach-dove/Kconfig @@ -20,18 +20,6 @@ config MACH_CM_A510 Say 'Y' here if you want your kernel to support the CompuLab CM-A510 Board. -config MACH_DOVE_DT - bool "Marvell Dove Flattened Device Tree" - select DOVE_CLK - select ORION_IRQCHIP - select ORION_TIMER - select REGULATOR - select REGULATOR_FIXED_VOLTAGE - select USE_OF - help - Say 'Y' here if you want your kernel to support the - Marvell Dove using flattened device tree. - endmenu endif diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index cbc5c0618788..b608a21919fb 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -2,5 +2,4 @@ obj-y += common.o obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o -obj-$(CONFIG_MACH_DOVE_DT) += board-dt.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c deleted file mode 100644 index 49fa9abd09da..000000000000 --- a/arch/arm/mach-dove/board-dt.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * arch/arm/mach-dove/board-dt.c - * - * Marvell Dove 88AP510 System On Chip FDT Board - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include <linux/init.h> -#include <linux/clk-provider.h> -#include <linux/of.h> -#include <linux/of_platform.h> -#include <asm/hardware/cache-tauros2.h> -#include <asm/mach/arch.h> -#include <mach/dove.h> -#include <mach/pm.h> -#include <plat/common.h> -#include "common.h" - -static void __init dove_dt_init(void) -{ - pr_info("Dove 88AP510 SoC\n"); - -#ifdef CONFIG_CACHE_TAUROS2 - tauros2_init(0); -#endif - BUG_ON(mvebu_mbus_dt_init()); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static const char * const dove_dt_board_compat[] = { - "marvell,dove", - NULL -}; - -DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") - .map_io = dove_map_io, - .init_machine = dove_dt_init, - .restart = dove_restart, - .dt_compat = dove_dt_board_compat, -MACHINE_END |