diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-05 19:09:03 +0100 |
| commit | 58daf18cdcab550262a5f4681e1f1e073e21965a (patch) | |
| tree | 2096324b947761a567dd451f33664f17ee1de2cd /arch/arm/common | |
| parent | Merge branches 'mmci' and 'pl011-dma' into devel (diff) | |
| parent | ARM: vexpress: add sched_clock() for Versatile Express (diff) | |
| download | linux-58daf18cdcab550262a5f4681e1f1e073e21965a.tar.xz linux-58daf18cdcab550262a5f4681e1f1e073e21965a.zip | |
Merge branch 'clksrc' into devel
Conflicts:
arch/arm/mach-vexpress/v2m.c
arch/arm/plat-omap/counter_32k.c
arch/arm/plat-versatile/Makefile
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/timer-sp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index 4740313daa5b..6ef3342153b9 100644 --- a/arch/arm/common/timer-sp.c +++ b/arch/arm/common/timer-sp.c @@ -44,7 +44,6 @@ static struct clocksource clocksource_sp804 = { .rating = 200, .read = sp804_read, .mask = CLOCKSOURCE_MASK(32), - .shift = 20, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -61,8 +60,7 @@ void __init sp804_clocksource_init(void __iomem *base) writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC, clksrc_base + TIMER_CTRL); - cs->mult = clocksource_khz2mult(TIMER_FREQ_KHZ, cs->shift); - clocksource_register(cs); + clocksource_register_khz(cs, TIMER_FREQ_KHZ); } |