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-integrator | |
| 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-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 8fb8afb014ef..c4914c69462b 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
| @@ -484,7 +484,7 @@ static void __init intcp_timer_init(void) | |||
| 484 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); | 484 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); |
| 485 | 485 | ||
| 486 | sp804_clocksource_init(TIMER2_VA_BASE, "timer2"); | 486 | sp804_clocksource_init(TIMER2_VA_BASE, "timer2"); |
| 487 | sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1); | 487 | sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1, "timer1"); |
| 488 | } | 488 | } |
| 489 | 489 | ||
| 490 | static struct sys_timer cp_timer = { | 490 | static struct sys_timer cp_timer = { |