diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 07:08:23 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 13:04:53 -0400 |
commit | fb593cf38fc426331275d761fefe13096070f56a (patch) | |
tree | f650ea0f76fe48d7e54a8cce506c099b6599c470 /arch/arm/mach-integrator/integrator_cp.c | |
parent | 933e54a53ccb68543ffb7ea32168ea086c93d09a (diff) |
clocksource: ARM sp804: allow clocksource name to be specified
This allows platforms to specify the clocksource name upon
registration, which is necessary should they wish to register more
than one sp804 clocksource.
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/integrator_cp.c')
-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 9e3ce26023e..46fb7f580fe 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -476,7 +476,7 @@ static void __init intcp_timer_init(void) | |||
476 | writel(0, TIMER1_VA_BASE + TIMER_CTRL); | 476 | writel(0, TIMER1_VA_BASE + TIMER_CTRL); |
477 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); | 477 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); |
478 | 478 | ||
479 | sp804_clocksource_init(TIMER2_VA_BASE); | 479 | sp804_clocksource_init(TIMER2_VA_BASE, "timer2"); |
480 | sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1); | 480 | sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1); |
481 | } | 481 | } |
482 | 482 | ||