diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-13 08:18:21 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-22 17:44:33 -0500 |
commit | 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e (patch) | |
tree | 17881213f92991587e100a5709299bb4c121a0d6 /arch/arm/mach-netx | |
parent | ff9c9772480f06bc7164217b93ebb99fc088539f (diff) |
ARM: netx: 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-netx')
-rw-r--r-- | arch/arm/mach-netx/time.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c index 82801dbf0579..f12f22d09b6c 100644 --- a/arch/arm/mach-netx/time.c +++ b/arch/arm/mach-netx/time.c | |||
@@ -114,7 +114,6 @@ static struct clocksource clocksource_netx = { | |||
114 | .rating = 200, | 114 | .rating = 200, |
115 | .read = netx_get_cycles, | 115 | .read = netx_get_cycles, |
116 | .mask = CLOCKSOURCE_MASK(32), | 116 | .mask = CLOCKSOURCE_MASK(32), |
117 | .shift = 20, | ||
118 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 117 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
119 | }; | 118 | }; |
120 | 119 | ||
@@ -151,9 +150,7 @@ static void __init netx_timer_init(void) | |||
151 | writel(NETX_GPIO_COUNTER_CTRL_RUN, | 150 | writel(NETX_GPIO_COUNTER_CTRL_RUN, |
152 | NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE)); | 151 | NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE)); |
153 | 152 | ||
154 | clocksource_netx.mult = | 153 | clocksource_register_hz(&clocksource_netx, CLOCK_TICK_RATE); |
155 | clocksource_hz2mult(CLOCK_TICK_RATE, clocksource_netx.shift); | ||
156 | clocksource_register(&clocksource_netx); | ||
157 | 154 | ||
158 | netx_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, | 155 | netx_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, |
159 | netx_clockevent.shift); | 156 | netx_clockevent.shift); |