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>

diff --git a/arch/arm/plat-mxc/epit.c b/arch/arm/plat-mxc/epit.c
index ee9582f4972e87da83c0d6c29d196e31dd612651..d69d343ff61f1989cdfb1982b000eccc9aeb8d1d 100644 (file)
--- a/arch/arm/plat-mxc/epit.c
+++ b/arch/arm/plat-mxc/epit.c
@@ -93,7 +93,6 @@ static struct clocksource clocksource_epit = {
        .rating         = 200,
        .read           = epit_read,
        .mask           = CLOCKSOURCE_MASK(32),
-       .shift          = 20,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -101,9 +100,7 @@ static int __init epit_clocksource_init(struct clk *timer_clk)
 {
        unsigned int c = clk_get_rate(timer_clk);
 
-       clocksource_epit.mult = clocksource_hz2mult(c,
-                                       clocksource_epit.shift);
-       clocksource_register(&clocksource_epit);
+       clocksource_register_hz(&clocksource_epit, c);
 
        return 0;
 }

diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index f9a1b059a76cde1926f50758200c046f27685e7d..9f0c2610595ef5e282059e981278af5fdd0985fb 100644 (file)
--- 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;
 }