diff options
| author | Russell King | 2011-05-12 12:08:23 +0100 |
|---|---|---|
| committer | Russell King | 2011-05-23 18:04:53 +0100 |
| commit | fb593cf38fc426331275d761fefe13096070f56a (patch) | |
| tree | f650ea0f76fe48d7e54a8cce506c099b6599c470 /arch/arm/mach-vexpress/v2m.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-vexpress/v2m.c')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index ba46e8e07437..ccf1f899ac21 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -65,7 +65,7 @@ static void __init v2m_timer_init(void) writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL); writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); - sp804_clocksource_init(MMIO_P2V(V2M_TIMER1)); + sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1"); sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0); } |