diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 15:31:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 18:04:53 +0100 |
| commit | 57cc4f7de2b896ca79185e337eaf7ff9906c4656 (patch) | |
| tree | d572d278dfc7d319518b73103905574f0a4b06e2 /arch/arm/mach-vexpress/v2m.c | |
| parent | clocksource: ARM sp804: obtain sp804 timer rate via clks (diff) | |
| download | linux-dev-57cc4f7de2b896ca79185e337eaf7ff9906c4656.tar.xz linux-dev-57cc4f7de2b896ca79185e337eaf7ff9906c4656.zip | |
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 '')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 77d5db3d7808..f6fecdd0fbe8 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -66,7 +66,8 @@ static void __init v2m_timer_init(void) writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL); sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1"); - sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0); + sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0, + "v2m-timer0"); } static struct sys_timer v2m_timer = { |