Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ebbb4ae authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

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: default avatarMagnus 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: default avatarSimon Horman <horms+renesas@verge.net.au>
parent d6b51d6b

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ config MACH_MARZEN 
	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select USE_OF



config MACH_MARZEN_REFERENCE

	bool "MARZEN board - Reference Device Tree Implementation"

arch/arm/mach-shmobile/board-marzen.c

+7 −1
Original line number Diff line number Diff line
@@ -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