diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:19:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:37 -0500 |
commit | 6b46340a18e7552656097119d121b4b42049dde1 (patch) | |
tree | b1cc5acf51198965602c4198107df523f9f60b0c /arch/arm/mach-tcc8k | |
parent | 2c760b5b52a56e8b92c384dc9611e23fd4980d03 (diff) |
ARM: tcc8k: 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.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-tcc8k')
-rw-r--r-- | arch/arm/mach-tcc8k/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-tcc8k/time.c b/arch/arm/mach-tcc8k/time.c index 78d06008841d..e0a8d609afe1 100644 --- a/arch/arm/mach-tcc8k/time.c +++ b/arch/arm/mach-tcc8k/time.c | |||
@@ -35,7 +35,6 @@ static struct clocksource clocksource_tcc = { | |||
35 | .rating = 200, | 35 | .rating = 200, |
36 | .read = tcc_get_cycles, | 36 | .read = tcc_get_cycles, |
37 | .mask = CLOCKSOURCE_MASK(32), | 37 | .mask = CLOCKSOURCE_MASK(32), |
38 | .shift = 28, | ||
39 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 38 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
40 | }; | 39 | }; |
41 | 40 | ||
@@ -103,9 +102,7 @@ static int __init tcc_clockevent_init(struct clk *clock) | |||
103 | { | 102 | { |
104 | unsigned int c = clk_get_rate(clock); | 103 | unsigned int c = clk_get_rate(clock); |
105 | 104 | ||
106 | clocksource_tcc.mult = clocksource_hz2mult(c, | 105 | clocksource_register_hz(&clocksource_tcc, c); |
107 | clocksource_tcc.shift); | ||
108 | clocksource_register(&clocksource_tcc); | ||
109 | 106 | ||
110 | clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC, | 107 | clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC, |
111 | clockevent_tcc.shift); | 108 | clockevent_tcc.shift); |