diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 10:31:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 13:04:53 -0400 |
commit | 57cc4f7de2b896ca79185e337eaf7ff9906c4656 (patch) | |
tree | d572d278dfc7d319518b73103905574f0a4b06e2 /arch/arm/mach-vexpress/v2m.c | |
parent | 7ff550de99141cbd3be0129d563cc4554fdde9f6 (diff) |
clockevents: ARM sp804: allow clockevent name to be specified
This allows platforms to specify the clcokevent name upon registration.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-vexpress/v2m.c')
-rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 77d5db3d7808..f6fecdd0fbe8 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c | |||
@@ -66,7 +66,8 @@ static void __init v2m_timer_init(void) | |||
66 | writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); | 66 | writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); |
67 | 67 | ||
68 | sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1"); | 68 | sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1"); |
69 | sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0); | 69 | sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0, |
70 | "v2m-timer0"); | ||
70 | } | 71 | } |
71 | 72 | ||
72 | static struct sys_timer v2m_timer = { | 73 | static struct sys_timer v2m_timer = { |