| From ab6fb627a7ffd11c0bfa7f015824fc4871153488 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm+renesas@opensource.se> |
| Date: Tue, 20 May 2014 08:37:33 +0900 |
| Subject: ARM: shmobile: Use r8a7790 DT CPU Frequency for Lager |
| |
| Convert the Lager board support to use shmobile_init_delay() |
| to be able to migrate away from per-SoC delay setup functions. |
| |
| 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 a5d626813fc13f80b6ab80de1fe303ce5cdd8c54) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-lager-reference.c | 2 +- |
| arch/arm/mach-shmobile/board-lager.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c |
| index c5e656e3bae3..c2175c8e1ce7 100644 |
| --- a/arch/arm/mach-shmobile/board-lager-reference.c |
| +++ b/arch/arm/mach-shmobile/board-lager-reference.c |
| @@ -115,7 +115,7 @@ static const char *lager_boards_compat_dt[] __initdata = { |
| |
| DT_MACHINE_START(LAGER_DT, "lager") |
| .smp = smp_ops(r8a7790_smp_ops), |
| - .init_early = r8a7790_init_early, |
| + .init_early = shmobile_init_delay, |
| .init_time = rcar_gen2_timer_init, |
| .init_machine = lager_add_standard_devices, |
| .init_late = shmobile_init_late, |
| diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c |
| index a51d202cddcf..6fb08dbc953c 100644 |
| --- a/arch/arm/mach-shmobile/board-lager.c |
| +++ b/arch/arm/mach-shmobile/board-lager.c |
| @@ -887,7 +887,7 @@ static const char * const lager_boards_compat_dt[] __initconst = { |
| |
| DT_MACHINE_START(LAGER_DT, "lager") |
| .smp = smp_ops(r8a7790_smp_ops), |
| - .init_early = r8a7790_init_early, |
| + .init_early = shmobile_init_delay, |
| .init_time = rcar_gen2_timer_init, |
| .init_machine = lager_init, |
| .init_late = shmobile_init_late, |
| -- |
| 2.1.2 |
| |
