Skip to content

Commit

Permalink
C6X: fix timer64 initialization
Browse files Browse the repository at this point in the history
Some SoCs have a timer block enable controlled through the DSCR registers.
There is a problem in the timer64 driver initialization where the code
accesses a timer register to get the divisor used to calculate timer clock
rate. If the timer block has not been enabled when this register read takes
place, an exception is generated. This patch makes sure that the timer block
is enabled before accessing the registers.

Signed-off-by: Mark Salter <msalter@redhat.com>
  • Loading branch information
Mark Salter committed Jan 8, 2012
1 parent 4a059ff commit 25b48ff
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion arch/c6x/platforms/timer64.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,17 @@ void __init timer64_init(void)

/* If there is a device state control, save the ID. */
err = of_property_read_u32(np, "ti,dscr-dev-enable", &val);
if (!err)
if (!err) {
timer64_devstate_id = val;

/*
* It is necessary to enable the timer block here because
* the TIMER_DIVISOR macro needs to read a timer register
* to get the divisor.
*/
dscr_set_devstate(timer64_devstate_id, DSCR_DEVSTATE_ENABLED);
}

pr_debug("%s: Timer irq=%d.\n", np->full_name, cd->irq);

clockevents_calc_mult_shift(cd, c6x_core_freq / TIMER_DIVISOR, 5);
Expand Down

0 comments on commit 25b48ff

Please sign in to comment.