diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-03-25 12:20:36 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-04-11 16:11:19 -0400 |
commit | b2a93b1d6b0d1af00e4796f3ef1252d2862513e3 (patch) | |
tree | 0f011edc7d5f02556f32fde07380dc606ff314f0 | |
parent | 34c2e5feeb0164baef76555141ad5b8dc84394bb (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>
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 3 |
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) | |||
61 | if (WARN_ON(!base || irq == NO_IRQ)) | 61 | if (WARN_ON(!base || irq == NO_IRQ)) |
62 | return; | 62 | return; |
63 | 63 | ||
64 | writel(0, base + TIMER_1_BASE + TIMER_CTRL); | ||
65 | writel(0, base + TIMER_2_BASE + TIMER_CTRL); | ||
66 | |||
67 | sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1"); | 64 | sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1"); |
68 | sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0"); | 65 | sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0"); |
69 | } | 66 | } |