Commit ff9c9772 authored by Russell King's avatar Russell King
Browse files

ARM: MSM: update clock source registration 



In d7e81c26 (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.

Tested-By: default avatarJeff Ohlstein <johlstei@codeaurora.org>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5975f496

arch/arm/mach-msm/timer.c

+1 −4
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static struct msm_clock msm_clocks[] = { 
			.rating         = 200,

			.read           = msm_gpt_read,

			.mask           = CLOCKSOURCE_MASK(32),

			.shift          = 17,

			.flags          = CLOCK_SOURCE_IS_CONTINUOUS,

		},

		.irq = {
@@ -164,7 +163,6 @@ static struct msm_clock msm_clocks[] = { 
			.rating         = 300,

			.read           = msm_dgt_read,

			.mask           = CLOCKSOURCE_MASK((32 - MSM_DGT_SHIFT)),

			.shift          = 24 - MSM_DGT_SHIFT,

			.flags          = CLOCK_SOURCE_IS_CONTINUOUS,

		},

		.irq = {
@@ -205,8 +203,7 @@ static void __init msm_timer_init(void) 
		ce->min_delta_ns = clockevent_delta2ns(4, ce);

		ce->cpumask = cpumask_of(0);



		cs->mult = clocksource_hz2mult(clock->freq, cs->shift);

		res = clocksource_register(cs);

		res = clocksource_register_hz(cs, clock->freq);

		if (res)

			printk(KERN_ERR "msm_timer_init: clocksource_register "

			       "failed for %s\n", cs->name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE