diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 13:08:23 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 19:04:53 +0200 |
| commit | fb593cf38fc426331275d761fefe13096070f56a (patch) | |
| tree | f650ea0f76fe48d7e54a8cce506c099b6599c470 /arch/arm/mach-versatile | |
| parent | clocksource: convert OMAP1 to 32-bit down counting clocksource (diff) | |
| download | linux-fb593cf38fc426331275d761fefe13096070f56a.tar.xz linux-fb593cf38fc426331275d761fefe13096070f56a.zip | |
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) writel(0, TIMER2_VA_BASE + TIMER_CTRL); writel(0, TIMER3_VA_BASE + TIMER_CTRL); - sp804_clocksource_init(TIMER3_VA_BASE); + sp804_clocksource_init(TIMER3_VA_BASE, "timer3"); sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1); } |