aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-vexpress')
-rw-r--r--arch/arm/mach-vexpress/v2m.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 82be02b3ae28..915683cb67d6 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -291,10 +291,6 @@ static void __init v2m_timer_init(void)
291 v2m_sp804_init(ioremap(V2M_TIMER01, SZ_4K), IRQ_V2M_TIMER0); 291 v2m_sp804_init(ioremap(V2M_TIMER01, SZ_4K), IRQ_V2M_TIMER0);
292} 292}
293 293
294static struct sys_timer v2m_timer = {
295 .init = v2m_timer_init,
296};
297
298static void __init v2m_init_early(void) 294static void __init v2m_init_early(void)
299{ 295{
300 if (ct_desc->init_early) 296 if (ct_desc->init_early)
@@ -376,7 +372,7 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
376 .map_io = v2m_map_io, 372 .map_io = v2m_map_io,
377 .init_early = v2m_init_early, 373 .init_early = v2m_init_early,
378 .init_irq = v2m_init_irq, 374 .init_irq = v2m_init_irq,
379 .timer = &v2m_timer, 375 .init_time = v2m_timer_init,
380 .init_machine = v2m_init, 376 .init_machine = v2m_init,
381 .restart = vexpress_restart, 377 .restart = vexpress_restart,
382MACHINE_END 378MACHINE_END
@@ -457,10 +453,6 @@ static void __init v2m_dt_timer_init(void)
457 24000000); 453 24000000);
458} 454}
459 455
460static struct sys_timer v2m_dt_timer = {
461 .init = v2m_dt_timer_init,
462};
463
464static const struct of_device_id v2m_dt_bus_match[] __initconst = { 456static const struct of_device_id v2m_dt_bus_match[] __initconst = {
465 { .compatible = "simple-bus", }, 457 { .compatible = "simple-bus", },
466 { .compatible = "arm,amba-bus", }, 458 { .compatible = "arm,amba-bus", },
@@ -487,7 +479,7 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
487 .map_io = v2m_dt_map_io, 479 .map_io = v2m_dt_map_io,
488 .init_early = v2m_dt_init_early, 480 .init_early = v2m_dt_init_early,
489 .init_irq = irqchip_init, 481 .init_irq = irqchip_init,
490 .timer = &v2m_dt_timer, 482 .init_time = v2m_dt_timer_init,
491 .init_machine = v2m_dt_init, 483 .init_machine = v2m_dt_init,
492 .restart = vexpress_restart, 484 .restart = vexpress_restart,
493MACHINE_END 485MACHINE_END