Commit 650f1567 authored by Jeff Ohlstein's avatar Jeff Ohlstein Committed by David Brown

msm: timer: compensate for timer shift in msm_read_timer_count

Some msm targets have timers whose lower bits are unreliable. So, we
present our timers as lower frequency than they actually are, and ignore
the bottom 5 bits on such targets. This compensation was erroneously
removed from the msm_read_timer_count function, so restore it.

This was broken by 94790ec2 "msm: timer: SMP timer support for msm".
Signed-off-by: default avatarJeff Ohlstein <johlstei@codeaurora.org>
parent ebf30dc9
...@@ -102,7 +102,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs) ...@@ -102,7 +102,11 @@ static cycle_t msm_read_timer_count(struct clocksource *cs)
{ {
struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource); struct msm_clock *clk = container_of(cs, struct msm_clock, clocksource);
return readl(clk->global_counter); /*
* Shift timer count down by a constant due to unreliable lower bits
* on some targets.
*/
return readl(clk->global_counter) >> clk->shift;
} }
static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt) static struct msm_clock *clockevent_to_clock(struct clock_event_device *evt)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment