diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:20:06 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:38 -0500 |
commit | 894cf56b1a64b65360086c2c890c2ae7f257793f (patch) | |
tree | aa5a7b5c6f9d5804990d1d3fe4ffb9aa6318b571 /arch/arm/mach-w90x900/time.c | |
parent | da797478c1ba05a858c7719a02ce0856a5bb69ce (diff) |
ARM: nuc: 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: Wan zongshun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-w90x900/time.c')
-rw-r--r-- | arch/arm/mach-w90x900/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c index b80f769bc135..4b089cb930dc 100644 --- a/arch/arm/mach-w90x900/time.c +++ b/arch/arm/mach-w90x900/time.c | |||
@@ -153,7 +153,6 @@ static struct clocksource clocksource_nuc900 = { | |||
153 | .rating = 200, | 153 | .rating = 200, |
154 | .read = nuc900_get_cycles, | 154 | .read = nuc900_get_cycles, |
155 | .mask = CLOCKSOURCE_MASK(TDR_SHIFT), | 155 | .mask = CLOCKSOURCE_MASK(TDR_SHIFT), |
156 | .shift = 10, | ||
157 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 156 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
158 | }; | 157 | }; |
159 | 158 | ||
@@ -176,9 +175,7 @@ static void __init nuc900_clocksource_init(void) | |||
176 | val |= (COUNTEN | PERIOD | PRESCALE); | 175 | val |= (COUNTEN | PERIOD | PRESCALE); |
177 | __raw_writel(val, REG_TCSR1); | 176 | __raw_writel(val, REG_TCSR1); |
178 | 177 | ||
179 | clocksource_nuc900.mult = | 178 | clocksource_register_hz(&clocksource_nuc900, rate); |
180 | clocksource_khz2mult((rate / 1000), clocksource_nuc900.shift); | ||
181 | clocksource_register(&clocksource_nuc900); | ||
182 | } | 179 | } |
183 | 180 | ||
184 | static void __init nuc900_timer_init(void) | 181 | static void __init nuc900_timer_init(void) |