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/ct-ca9x4.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/ct-ca9x4.c')
-rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 6004f06cbde5..271213384203 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
@@ -72,7 +72,8 @@ static void __init ct_ca9x4_timer_init(void) | |||
72 | writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL); | 72 | writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL); |
73 | 73 | ||
74 | sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1"); | 74 | sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1"); |
75 | sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0); | 75 | sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0, |
76 | "ct-timer0"); | ||
76 | } | 77 | } |
77 | 78 | ||
78 | static struct sys_timer ct_ca9x4_timer = { | 79 | static struct sys_timer ct_ca9x4_timer = { |