ARM: spear: update clock source registration
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 13 Dec 2010 13:21:21 +0000 (13:21 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Dec 2010 22:44:40 +0000 (22:44 +0000)
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: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/plat-spear/time.c

index ab21165..839c88d 100644 (file)
@@ -81,8 +81,6 @@ static struct clocksource clksrc = {
        .rating = 200,          /* its a pretty decent clock */
        .read = clocksource_read_cycles,
        .mask = 0xFFFF,         /* 16 bits */
-       .mult = 0,              /* to be computed */
-       .shift = 0,             /* to be computed */
        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -105,10 +103,8 @@ static void spear_clocksource_init(void)
        val |= CTRL_ENABLE ;
        writew(val, gpt_base + CR(CLKSRC));
 
-       clocksource_calc_mult_shift(&clksrc, tick_rate, SPEAR_MIN_RANGE);
-
        /* register the clocksource */
-       clocksource_register(&clksrc);
+       clocksource_register_hz(&clksrc, tick_rate);
 }
 
 static struct clock_event_device clkevt = {