diff options
author | Magnus Damm <damm+renesas@opensource.se> | 2014-06-05 01:32:04 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-17 04:27:54 -0400 |
commit | ef9026e6879da358376b58fc63fe7a82f07404ad (patch) | |
tree | c2966229c52030e17d8c6d97f5a52705803dfe6d | |
parent | 11f1ca10b668995a031aade5c2728f0a251aaec7 (diff) |
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>
-rw-r--r-- | arch/arm/mach-shmobile/setup-emev2.c | 7 |
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) | |||
42 | iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc)); | 42 | iotable_init(emev2_io_desc, ARRAY_SIZE(emev2_io_desc)); |
43 | } | 43 | } |
44 | 44 | ||
45 | static void __init emev2_init_delay(void) | ||
46 | { | ||
47 | shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */ | ||
48 | } | ||
49 | |||
50 | static void __init emev2_add_standard_devices_dt(void) | 45 | static void __init emev2_add_standard_devices_dt(void) |
51 | { | 46 | { |
52 | of_clk_init(NULL); | 47 | of_clk_init(NULL); |
@@ -63,7 +58,7 @@ extern struct smp_operations emev2_smp_ops; | |||
63 | DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") | 58 | DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") |
64 | .smp = smp_ops(emev2_smp_ops), | 59 | .smp = smp_ops(emev2_smp_ops), |
65 | .map_io = emev2_map_io, | 60 | .map_io = emev2_map_io, |
66 | .init_early = emev2_init_delay, | 61 | .init_early = shmobile_init_delay, |
67 | .init_machine = emev2_add_standard_devices_dt, | 62 | .init_machine = emev2_add_standard_devices_dt, |
68 | .init_late = shmobile_init_late, | 63 | .init_late = shmobile_init_late, |
69 | .dt_compat = emev2_boards_compat_dt, | 64 | .dt_compat = emev2_boards_compat_dt, |