From: Magnus Damm Date: Fri, 6 Jun 2014 05:28:56 +0000 (+0900) Subject: ARM: shmobile: Use shmobile_init_delay() on Genmai boards X-Git-Tag: v3.17-rc1~80^2~24^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4387ac5282616ff14edc733aca79fe046ddb45f5;p=thirdparty%2Flinux.git ARM: shmobile: Use shmobile_init_delay() on Genmai boards Adjust Genmai board support to use shmobile_init_delay() together with r7s72100 CPU Frequency settings from the DTS. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c index d341ef09ec37b..c06dc5c12d1e7 100644 --- a/arch/arm/mach-shmobile/board-genmai-reference.c +++ b/arch/arm/mach-shmobile/board-genmai-reference.c @@ -47,7 +47,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(GENMAI_DT, "genmai") - .init_early = r7s72100_init_early, + .init_early = shmobile_init_delay, .init_machine = genmai_add_standard_devices, .dt_compat = genmai_boards_compat_dt, MACHINE_END diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c index f0a8eca7d10d5..a0994f36b3487 100644 --- a/arch/arm/mach-shmobile/board-genmai.c +++ b/arch/arm/mach-shmobile/board-genmai.c @@ -154,7 +154,7 @@ static const char * const genmai_boards_compat_dt[] __initconst = { }; DT_MACHINE_START(GENMAI_DT, "genmai") - .init_early = r7s72100_init_early, + .init_early = shmobile_init_delay, .init_machine = genmai_add_standard_devices, .dt_compat = genmai_boards_compat_dt, MACHINE_END