summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/time.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-13 13:20:35 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-22 22:44:39 +0000
commit509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 (patch)
tree71bd04ef9f65aa70541f4d70e96d562bb8dfaf77 /arch/arm/plat-mxc/time.c
parentd28b116b9239b603f790a5ed6f0c5fe329561b49 (diff)
downloadlinux-509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6.tar.gz
linux-509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6.tar.bz2
linux-509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6.zip
ARM: mxc: 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: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-mxc/time.c')
-rw-r--r--arch/arm/plat-mxc/time.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index f9a1b059a76c..9f0c2610595e 100644
--- a/arch/arm/plat-mxc/time.c
+++ b/arch/arm/plat-mxc/time.c
@@ -120,7 +120,6 @@ static struct clocksource clocksource_mxc = {
.rating = 200,
.read = mx1_2_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
- .shift = 20,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@ -131,9 +130,7 @@ static int __init mxc_clocksource_init(struct clk *timer_clk)
if (timer_is_v2())
clocksource_mxc.read = v2_get_cycles;
- clocksource_mxc.mult = clocksource_hz2mult(c,
- clocksource_mxc.shift);
- clocksource_register(&clocksource_mxc);
+ clocksource_register_hz(&clocksource_mxc, c);
return 0;
}