aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/setup-emev2.c
diff options
context:
space:
mode:
authorMagnus Damm <damm+renesas@opensource.se>2014-06-05 14:32:04 +0900
committerSimon Horman <horms+renesas@verge.net.au>2014-06-17 17:27:54 +0900
commitef9026e6879da358376b58fc63fe7a82f07404ad (patch)
treec2966229c52030e17d8c6d97f5a52705803dfe6d /arch/arm/mach-shmobile/setup-emev2.c
parentARM: shmobile: Update EMEV2 DTS to include CPU frequency (diff)
downloadlinux-dev-ef9026e6879da358376b58fc63fe7a82f07404ad.tar.xz
linux-dev-ef9026e6879da358376b58fc63fe7a82f07404ad.zip
ARM: shmobile: Use shmobile_init_delay() on EMEV2
Adjust EMEV2 to use shmobile_init_delay() together with 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>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-emev2.c')
-rw-r--r--arch/arm/mach-shmobile/setup-emev2.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 6e4ffa74dad4..e10d34e24817 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -42,11 +42,6 @@ static void __init emev2_map_io(void)
iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc));
}
-static void __init emev2_init_delay(void)
-{
- shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
-}
-
static void __init emev2_add_standard_devices_dt(void)
{
of_clk_init(NULL);
@@ -63,7 +58,7 @@ extern struct smp_operations emev2_smp_ops;
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
.map_io = emev2_map_io,
- .init_early = emev2_init_delay,
+ .init_early = shmobile_init_delay,
.init_machine = emev2_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = emev2_boards_compat_dt,