diff options
Diffstat (limited to 'arch/arm/mach-dove/common.c')
-rw-r--r-- | arch/arm/mach-dove/common.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 89f4f993cd03..0c7911b3e155 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -242,17 +242,13 @@ static int __init dove_find_tclk(void) | |||
242 | return 166666667; | 242 | return 166666667; |
243 | } | 243 | } |
244 | 244 | ||
245 | static void __init dove_timer_init(void) | 245 | void __init dove_timer_init(void) |
246 | { | 246 | { |
247 | dove_tclk = dove_find_tclk(); | 247 | dove_tclk = dove_find_tclk(); |
248 | orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR, | 248 | orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR, |
249 | IRQ_DOVE_BRIDGE, dove_tclk); | 249 | IRQ_DOVE_BRIDGE, dove_tclk); |
250 | } | 250 | } |
251 | 251 | ||
252 | struct sys_timer dove_timer = { | ||
253 | .init = dove_timer_init, | ||
254 | }; | ||
255 | |||
256 | /***************************************************************************** | 252 | /***************************************************************************** |
257 | * Cryptographic Engines and Security Accelerator (CESA) | 253 | * Cryptographic Engines and Security Accelerator (CESA) |
258 | ****************************************************************************/ | 254 | ****************************************************************************/ |
@@ -454,7 +450,7 @@ DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") | |||
454 | .map_io = dove_map_io, | 450 | .map_io = dove_map_io, |
455 | .init_early = dove_init_early, | 451 | .init_early = dove_init_early, |
456 | .init_irq = orion_dt_init_irq, | 452 | .init_irq = orion_dt_init_irq, |
457 | .timer = &dove_timer, | 453 | .init_time = dove_timer_init, |
458 | .init_machine = dove_dt_init, | 454 | .init_machine = dove_dt_init, |
459 | .restart = dove_restart, | 455 | .restart = dove_restart, |
460 | .dt_compat = dove_dt_board_compat, | 456 | .dt_compat = dove_dt_board_compat, |