summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2014-06-06 07:28:56 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-06-17 12:50:33 +0200
commit4387ac5282616ff14edc733aca79fe046ddb45f5 (patch)
treec7587b12f59cf29eb21269fd2a8de0b3b878912e
parentARM: shmobile: Update r7s72100 DTS to include CPU frequency (diff)
downloadlinux-4387ac5282616ff14edc733aca79fe046ddb45f5.tar.xz
linux-4387ac5282616ff14edc733aca79fe046ddb45f5.zip
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 <damm+renesas@opensource.se> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/mach-shmobile/board-genmai-reference.c2
-rw-r--r--arch/arm/mach-shmobile/board-genmai.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index d341ef09ec37..c06dc5c12d1e 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 f0a8eca7d10d..a0994f36b348 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