aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu/armada-370-xp.c
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 04:50:55 -0500
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 04:50:55 -0500
commita79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68 (patch)
treeccc6042af17706823bc1ccacf931310a9e6ec487 /arch/arm/mach-mvebu/armada-370-xp.c
parent9bfd143ed247fc7a9e0573dc1fbaf6d124b5cac9 (diff)
parent8c4340fcfb3e40372101a608ccd906e456ed3fcd (diff)
Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
Diffstat (limited to 'arch/arm/mach-mvebu/armada-370-xp.c')
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index cd6eac17fb67..bd4e13f1b1d7 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -64,13 +64,12 @@ static void __init armada_370_xp_dt_init(void)
64 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 64 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
65} 65}
66 66
67static const char * const armada_370_xp_dt_board_dt_compat[] = { 67static const char * const armada_370_xp_dt_compat[] = {
68 "marvell,a370-db", 68 "marvell,armada-370-xp",
69 "marvell,axp-db",
70 NULL, 69 NULL,
71}; 70};
72 71
73DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") 72DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
74 .init_machine = armada_370_xp_dt_init, 73 .init_machine = armada_370_xp_dt_init,
75 .map_io = armada_370_xp_map_io, 74 .map_io = armada_370_xp_map_io,
76 .init_early = armada_370_xp_init_early, 75 .init_early = armada_370_xp_init_early,
@@ -78,5 +77,5 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")
78 .handle_irq = armada_370_xp_handle_irq, 77 .handle_irq = armada_370_xp_handle_irq,
79 .timer = &armada_370_xp_timer, 78 .timer = &armada_370_xp_timer,
80 .restart = mvebu_restart, 79 .restart = mvebu_restart,
81 .dt_compat = armada_370_xp_dt_board_dt_compat, 80 .dt_compat = armada_370_xp_dt_compat,
82MACHINE_END 81MACHINE_END