aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-shmobile/r8a73a4.h1
-rw-r--r--arch/arm/mach-shmobile/setup-r8a73a4.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-shmobile/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
index ce8bdd1d8a8a..5fafd6fcedf7 100644
--- a/arch/arm/mach-shmobile/r8a73a4.h
+++ b/arch/arm/mach-shmobile/r8a73a4.h
@@ -14,6 +14,5 @@ void r8a73a4_add_standard_devices(void);
14void r8a73a4_add_dt_devices(void); 14void r8a73a4_add_dt_devices(void);
15void r8a73a4_clock_init(void); 15void r8a73a4_clock_init(void);
16void r8a73a4_pinmux_init(void); 16void r8a73a4_pinmux_init(void);
17void r8a73a4_init_early(void);
18 17
19#endif /* __ASM_R8A73A4_H__ */ 18#endif /* __ASM_R8A73A4_H__ */
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 6fbcdcc39d53..53f40b70680d 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -295,13 +295,6 @@ void __init r8a73a4_add_standard_devices(void)
295 r8a73a4_register_dmac(); 295 r8a73a4_register_dmac();
296} 296}
297 297
298void __init r8a73a4_init_early(void)
299{
300#ifndef CONFIG_ARM_ARCH_TIMER
301 shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
302#endif
303}
304
305#ifdef CONFIG_USE_OF 298#ifdef CONFIG_USE_OF
306 299
307static const char *r8a73a4_boards_compat_dt[] __initdata = { 300static const char *r8a73a4_boards_compat_dt[] __initdata = {
@@ -310,7 +303,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
310}; 303};
311 304
312DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") 305DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
313 .init_early = r8a73a4_init_early, 306 .init_early = shmobile_init_delay,
314 .init_late = shmobile_init_late, 307 .init_late = shmobile_init_late,
315 .dt_compat = r8a73a4_boards_compat_dt, 308 .dt_compat = r8a73a4_boards_compat_dt,
316MACHINE_END 309MACHINE_END