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

Commit 5f65c5bd authored Jun 09, 2014 by Magnus Damm Committed by Simon Horman Jun 17, 2014

ARM: shmobile: Enable R-Car Gen2 CMA code in board files



Hook in the R-Car Gen2 CMA reservation code in the board
files for Lager and Koelsch. Both the DT-reference code
and the legacy code is modified.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

parent 8a0d1a2f

arch/arm/mach-shmobile/board-koelsch-reference.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -113,5 +113,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
	.init_time = rcar_gen2_timer_init,		.init_time = rcar_gen2_timer_init,
	.init_machine = koelsch_add_standard_devices,		.init_machine = koelsch_add_standard_devices,
	.init_late = shmobile_init_late,		.init_late = shmobile_init_late,
			.reserve = rcar_gen2_reserve,
	.dt_compat = koelsch_boards_compat_dt,		.dt_compat = koelsch_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
	.init_time = rcar_gen2_timer_init,		.init_time = rcar_gen2_timer_init,
	.init_machine = koelsch_init,		.init_machine = koelsch_init,
	.init_late = shmobile_init_late,		.init_late = shmobile_init_late,
			.reserve = rcar_gen2_reserve,
	.dt_compat = koelsch_boards_compat_dt,		.dt_compat = koelsch_boards_compat_dt,
	MACHINE_END		MACHINE_END

arch/arm/mach-shmobile/board-lager-reference.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -119,5 +119,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
	.init_time = rcar_gen2_timer_init,		.init_time = rcar_gen2_timer_init,
	.init_machine = lager_add_standard_devices,		.init_machine = lager_add_standard_devices,
	.init_late = shmobile_init_late,		.init_late = shmobile_init_late,
			.reserve = rcar_gen2_reserve,
	.dt_compat = lager_boards_compat_dt,		.dt_compat = lager_boards_compat_dt,
	MACHINE_END		MACHINE_END

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -891,5 +891,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
	.init_time = rcar_gen2_timer_init,		.init_time = rcar_gen2_timer_init,
	.init_machine = lager_init,		.init_machine = lager_init,
	.init_late = shmobile_init_late,		.init_late = shmobile_init_late,
			.reserve = rcar_gen2_reserve,
	.dt_compat = lager_boards_compat_dt,		.dt_compat = lager_boards_compat_dt,
	MACHINE_END		MACHINE_END