iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: shmobile: marzen: Switch to DT_MACHINE_START

Browse Source 
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>
This commit is contained in:
Magnus Damm 2013-07-24 16:30:42 +09:00 committed by Simon Horman
parent d6b51d6b6a
commit 7ebbb4ae6f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-shmobile/Kconfig
View File

@ -156,6 +156,7 @@ config MACH_MARZEN
depends on ARCH_R8A7779 depends on ARCH_R8A7779
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select REGULATOR_FIXED_VOLTAGE if REGULATOR select REGULATOR_FIXED_VOLTAGE if REGULATOR
select USE_OF
config MACH_MARZEN_REFERENCE config MACH_MARZEN_REFERENCE
bool "MARZEN board - Reference Device Tree Implementation" bool "MARZEN board - Reference Device Tree Implementation"

8
arch/arm/mach-shmobile/board-marzen.c
View File

@ -238,7 +238,12 @@ static void __init marzen_init(void)
platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); 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), .smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io, .map_io = r8a7779_map_io,
.init_early = r8a7779_add_early_devices, .init_early = r8a7779_add_early_devices,
@ -246,5 +251,6 @@ MACHINE_START(MARZEN, "marzen")
.init_irq = r8a7779_init_irq, .init_irq = r8a7779_init_irq,
.init_machine = marzen_init, .init_machine = marzen_init,
.init_late = r8a7779_init_late, .init_late = r8a7779_init_late,
.dt_compat = marzen_boards_compat_dt,
.init_time = r8a7779_earlytimer_init, .init_time = r8a7779_earlytimer_init,
MACHINE_END MACHINE_END