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-versatile | |
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-versatile')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index eb7ffa0ee8b5..aad6d395be44 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -764,7 +764,7 @@ static void __init versatile_timer_init(void) | |||
764 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); | 764 | writel(0, TIMER2_VA_BASE + TIMER_CTRL); |
765 | writel(0, TIMER3_VA_BASE + TIMER_CTRL); | 765 | writel(0, TIMER3_VA_BASE + TIMER_CTRL); |
766 | 766 | ||
767 | sp804_clocksource_init(TIMER3_VA_BASE); | 767 | sp804_clocksource_init(TIMER3_VA_BASE, "timer3"); |
768 | sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1); | 768 | sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1); |
769 | } | 769 | } |
770 | 770 | ||