diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 13:20:49 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 22:44:39 +0000 |
| commit | 8492fd28987732e42f33a3711299927e8905d448 (patch) | |
| tree | 798dac4db1845983bb79921c6e02ed2d1f15fd5b /arch/arm/plat-nomadik/timer.c | |
| parent | 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 (diff) | |
| download | blackbird-op-linux-8492fd28987732e42f33a3711299927e8905d448.tar.gz blackbird-op-linux-8492fd28987732e42f33a3711299927e8905d448.zip | |
ARM: nomadik: update clock source registration
In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants. Switch over to using this new interface.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-nomadik/timer.c')
| -rw-r--r-- | arch/arm/plat-nomadik/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c index 63cdc6025bd7..b0bd6dfea52b 100644 --- a/arch/arm/plat-nomadik/timer.c +++ b/arch/arm/plat-nomadik/timer.c @@ -222,7 +222,6 @@ void __init nmdk_timer_init(void) } else { cr |= MTU_CRn_PRESCALE_1; } - clocksource_calc_mult_shift(&nmdk_clksrc, rate, MTU_MIN_RANGE); /* Timer 0 is the free running clocksource */ writel(cr, mtu_base + MTU_CR(0)); @@ -233,7 +232,7 @@ void __init nmdk_timer_init(void) /* Now the clock source is ready */ nmdk_clksrc.read = nmdk_read_timer; - if (clocksource_register(&nmdk_clksrc)) + if (clocksource_register_hz(&nmdk_clksrc, rate)) pr_err("timer: failed to initialize clock source %s\n", nmdk_clksrc.name); |
