| From bb131925fb4a0087833052e9bca91f0e143cf75a Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Fri, 6 Jun 2014 14:28:56 +0900 |
| Subject: 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> |
| (cherry picked from commit 4387ac5282616ff14edc733aca79fe046ddb45f5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-genmai-reference.c | 2 +- |
| arch/arm/mach-shmobile/board-genmai.c | 2 +- |
| 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 |
| -- |
| 2.1.2 |
| |
