aboutsummaryrefslogtreecommitdiff
path: root/arch/c6x/platforms
diff options
context:
space:
mode:
authorMark Salter <msalter@redhat.com>2011-11-05 10:57:40 -0400
committerMark Salter <msalter@redhat.com>2012-01-08 15:12:17 -0500
commit25b48ff852e2e71b0d44d8ee6f69c9b704bd5070 (patch)
treeee48a9e41d4cdeffcbb68b50261576887357e7a2 /arch/c6x/platforms
parent4a059ff3a9a8bd4ee78e3b89721b698ddb43d385 (diff)
downloadvexpress-lsk-25b48ff852e2e71b0d44d8ee6f69c9b704bd5070.tar.gz
C6X: fix timer64 initialization
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>
Diffstat (limited to 'arch/c6x/platforms')
-rw-r--r--arch/c6x/platforms/timer64.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/c6x/platforms/timer64.c b/arch/c6x/platforms/timer64.c
index 783415861da..03c03c24919 100644
--- a/arch/c6x/platforms/timer64.c
+++ b/arch/c6x/platforms/timer64.c
@@ -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);