diff options
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a73a4.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a73a4.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c index 6683072a9d98..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 | ||
| 298 | void __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 | ||
| 307 | static const char *r8a73a4_boards_compat_dt[] __initdata = { | 300 | static const char *r8a73a4_boards_compat_dt[] __initdata = { |
| @@ -310,7 +303,8 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = { | |||
| 310 | }; | 303 | }; |
| 311 | 304 | ||
| 312 | DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") | 305 | DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)") |
| 313 | .init_early = r8a73a4_init_early, | 306 | .init_early = shmobile_init_delay, |
| 307 | .init_late = shmobile_init_late, | ||
| 314 | .dt_compat = r8a73a4_boards_compat_dt, | 308 | .dt_compat = r8a73a4_boards_compat_dt, |
| 315 | MACHINE_END | 309 | MACHINE_END |
| 316 | #endif /* CONFIG_USE_OF */ | 310 | #endif /* CONFIG_USE_OF */ |