aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-13 08:20:49 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 17:44:39 -0500
commit8492fd28987732e42f33a3711299927e8905d448 (patch)
tree798dac4db1845983bb79921c6e02ed2d1f15fd5b /arch/arm/plat-nomadik
parent509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 (diff)
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')
-rw-r--r--arch/arm/plat-nomadik/timer.c3
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)
222 } else { 222 } else {
223 cr |= MTU_CRn_PRESCALE_1; 223 cr |= MTU_CRn_PRESCALE_1;
224 } 224 }
225 clocksource_calc_mult_shift(&nmdk_clksrc, rate, MTU_MIN_RANGE);
226 225
227 /* Timer 0 is the free running clocksource */ 226 /* Timer 0 is the free running clocksource */
228 writel(cr, mtu_base + MTU_CR(0)); 227 writel(cr, mtu_base + MTU_CR(0));
@@ -233,7 +232,7 @@ void __init nmdk_timer_init(void)
233 /* Now the clock source is ready */ 232 /* Now the clock source is ready */
234 nmdk_clksrc.read = nmdk_read_timer; 233 nmdk_clksrc.read = nmdk_read_timer;
235 234
236 if (clocksource_register(&nmdk_clksrc)) 235 if (clocksource_register_hz(&nmdk_clksrc, rate))
237 pr_err("timer: failed to initialize clock source %s\n", 236 pr_err("timer: failed to initialize clock source %s\n",
238 nmdk_clksrc.name); 237 nmdk_clksrc.name);
239 238