diff options
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 0679ca6bf1f6..6bcf3cbd9223 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c | |||
@@ -1192,9 +1192,6 @@ static void __init eva_earlytimer_init(void) | |||
1192 | static void __init eva_add_early_devices(void) | 1192 | static void __init eva_add_early_devices(void) |
1193 | { | 1193 | { |
1194 | r8a7740_add_early_devices(); | 1194 | r8a7740_add_early_devices(); |
1195 | |||
1196 | /* override timer setup with board-specific code */ | ||
1197 | shmobile_timer.init = eva_earlytimer_init; | ||
1198 | } | 1195 | } |
1199 | 1196 | ||
1200 | #define RESCNT2 IOMEM(0xe6188020) | 1197 | #define RESCNT2 IOMEM(0xe6188020) |
@@ -1216,7 +1213,7 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva") | |||
1216 | .handle_irq = shmobile_handle_irq_intc, | 1213 | .handle_irq = shmobile_handle_irq_intc, |
1217 | .init_machine = eva_init, | 1214 | .init_machine = eva_init, |
1218 | .init_late = shmobile_init_late, | 1215 | .init_late = shmobile_init_late, |
1219 | .timer = &shmobile_timer, | 1216 | .init_time = eva_earlytimer_init, |
1220 | .dt_compat = eva_boards_compat_dt, | 1217 | .dt_compat = eva_boards_compat_dt, |
1221 | .restart = eva_restart, | 1218 | .restart = eva_restart, |
1222 | MACHINE_END | 1219 | MACHINE_END |