From 115f6d7e1cef912336853c094d0ce01686a54256 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Fri, 16 May 2014 13:43:00 +0900 Subject: [PATCH] ARM: shmobile: marzen-reference: Use DT CPU Frequency Convert the Marzen DT reference board support to use shmobile_init_delay() to be able to migrate away from per-SoC delay setup functions. Based on work for the Armadillo800 EVA board by Magnus Damm. Cc: Magnus Damm Signed-off-by: Simon Horman (cherry picked from commit 17ed9efd8afdd8c38f19ff72f08e71c1fd2376e3) Signed-off-by: Simon Horman --- arch/arm/mach-shmobile/board-marzen-reference.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c index 1b63686..bb2df32 100644 --- a/arch/arm/mach-shmobile/board-marzen-reference.c +++ b/arch/arm/mach-shmobile/board-marzen-reference.c @@ -66,7 +66,7 @@ static const char *marzen_boards_compat_dt[] __initdata = { DT_MACHINE_START(MARZEN, "marzen") .smp = smp_ops(r8a7779_smp_ops), .map_io = r8a7779_map_io, - .init_early = r8a7779_init_delay, + .init_early = shmobile_init_delay, .init_time = marzen_init_timer, .nr_irqs = NR_IRQS_LEGACY, .init_irq = r8a7779_init_irq_dt, -- 2.7.4