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/dove.c | |
parent | d4324ce357fa1b10447ebdfd01a681f12f39384f (diff) | |
parent | 00e8ec2f0b05bfc8acaf13cf91c2ca1e624f3535 (diff) | |
download | op-kernel-dev-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.zip op-kernel-dev-e7f274dccf7f18a58b86aa8cbd269cdfbdb08056.tar.gz |
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/dove.c')
-rw-r--r-- | arch/arm/mach-mvebu/dove.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c new file mode 100644 index 0000000..5e5a436 --- /dev/null +++ b/arch/arm/mach-mvebu/dove.c @@ -0,0 +1,39 @@ +/* + * arch/arm/mach-mvebu/dove.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/mbus.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <asm/hardware/cache-tauros2.h> +#include <asm/mach/arch.h> +#include "common.h" + +static void __init dove_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_compat[] = { + "marvell,dove", + NULL +}; + +DT_MACHINE_START(DOVE_DT, "Marvell Dove") + .init_machine = dove_init, + .restart = mvebu_restart, + .dt_compat = dove_dt_compat, +MACHINE_END |