summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-03-25 11:20:36 -0500
committerRob Herring <rob.herring@calxeda.com>2013-04-11 15:11:19 -0500
commitb2a93b1d6b0d1af00e4796f3ef1252d2862513e3 (patch)
tree0f011edc7d5f02556f32fde07380dc606ff314f0 /arch/arm
parent34c2e5feeb0164baef76555141ad5b8dc84394bb (diff)
ARM: vexpress: remove extra timer-sp control register clearing
The timer-sp initialization code clears the control register before initializing the timers, so every platform doing this is redundant. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-vexpress/v2m.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index cdc29d895ab0..09e571ddc984 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -61,9 +61,6 @@ static void __init v2m_sp804_init(void __iomem *base, unsigned int irq)
if (WARN_ON(!base || irq == NO_IRQ))
return;
- writel(0, base + TIMER_1_BASE + TIMER_CTRL);
- writel(0, base + TIMER_2_BASE + TIMER_CTRL);
-
sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1");
sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0");
}