diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 12:08:23 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 18:04:53 +0100 |
| commit | fb593cf38fc426331275d761fefe13096070f56a (patch) | |
| tree | f650ea0f76fe48d7e54a8cce506c099b6599c470 /arch/arm/common | |
| 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/common')
| -rw-r--r-- | arch/arm/common/timer-sp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index 445b05ee851..f6b9011744a 100644 --- a/arch/arm/common/timer-sp.c +++ b/arch/arm/common/timer-sp.c @@ -32,7 +32,7 @@ #define TIMER_FREQ_KHZ (1000) #define TIMER_RELOAD (TIMER_FREQ_KHZ * 1000 / HZ) -void __init sp804_clocksource_init(void __iomem *base) +void __init sp804_clocksource_init(void __iomem *base, const char *name) { /* setup timer 0 as free-running clocksource */ writel(0, base + TIMER_CTRL); @@ -41,7 +41,7 @@ void __init sp804_clocksource_init(void __iomem *base) writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC, base + TIMER_CTRL); - clocksource_mmio_init(base + TIMER_VALUE, "timer3", + clocksource_mmio_init(base + TIMER_VALUE, name, TIMER_FREQ_KHZ * 1000, 200, 32, clocksource_mmio_readl_down); } |