projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
34c2e5f
)
ARM: vexpress: remove extra timer-sp control register clearing
author
Rob Herring
<rob.herring@calxeda.com>
Mon, 25 Mar 2013 16:20:36 +0000
(11:20 -0500)
committer
Rob Herring
<rob.herring@calxeda.com>
Thu, 11 Apr 2013 20:11:19 +0000
(15:11 -0500)
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>
arch/arm/mach-vexpress/v2m.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-vexpress/v2m.c
b/arch/arm/mach-vexpress/v2m.c
index
cdc29d8
..
09e571d
100644
(file)
--- 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");
}