summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/board-marzen.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-07-24 11:30:42 +0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-30 08:28:01 +0400
commit7ebbb4ae6f2d6242178d332c67ad49772f9fe88d (patch)
tree829be78f1736ab9adbbc7b10064252824186eb58 /arch/arm/mach-shmobile/board-marzen.c
parentd6b51d6b6a33974dfa7b091f61e7a2bedd62f298 (diff)
downloadlinux-7ebbb4ae6f2d6242178d332c67ad49772f9fe88d.tar.xz
ARM: shmobile: marzen: Switch to DT_MACHINE_START
Convert the marzen board to use DT_MACHINE_START. With this in place all mach-shmobile boards use DT_MACHINE_START. Also, this makes it possible for the r8a7779 SMP code to use DT for CPUs. Signed-off-by: Magnus Damm <damm@opensource.se> [horms+renesas@verge.net.au: Select USE_OF in Kconfig] [horms+renesas@verge.net.au: Provide dt_compat in DT_MACHINE_START] Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/board-marzen.c')
-rw-r--r--arch/arm/mach-shmobile/board-marzen.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index a7d1010505bf..bcd07c065224 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -238,7 +238,12 @@ static void __init marzen_init(void)
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
}
-MACHINE_START(MARZEN, "marzen")
+static const char *marzen_boards_compat_dt[] __initdata = {
+ "renesas,marzen",
+ NULL,
+};
+
+DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
.init_early = r8a7779_add_early_devices,
@@ -246,5 +251,6 @@ MACHINE_START(MARZEN, "marzen")
.init_irq = r8a7779_init_irq,
.init_machine = marzen_init,
.init_late = r8a7779_init_late,
+ .dt_compat = marzen_boards_compat_dt,
.init_time = r8a7779_earlytimer_init,
MACHINE_END