diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-04-29 07:55:13 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-05-07 10:20:28 -0400 |
commit | 81ec1f929fe5be3f6464edf7939a9b65fc8223ca (patch) | |
tree | 9d995fa45ff6f418d8926b5371924fe811c8b90c /arch/arm/plat-mxc | |
parent | 74fe030e63bd9e4adc5a67128d4c8359b37df55d (diff) |
mxc: fix wrong register access in timer code
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c index 85f002e7f1e5..88fb3a57e029 100644 --- a/arch/arm/plat-mxc/time.c +++ b/arch/arm/plat-mxc/time.c | |||
@@ -234,9 +234,9 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) | |||
234 | uint32_t tstat; | 234 | uint32_t tstat; |
235 | 235 | ||
236 | if (cpu_is_mx3()) | 236 | if (cpu_is_mx3()) |
237 | tstat = __raw_readl(timer_base + MX1_2_TSTAT); | ||
238 | else | ||
239 | tstat = __raw_readl(timer_base + MX3_TSTAT); | 237 | tstat = __raw_readl(timer_base + MX3_TSTAT); |
238 | else | ||
239 | tstat = __raw_readl(timer_base + MX1_2_TSTAT); | ||
240 | 240 | ||
241 | gpt_irq_acknowledge(); | 241 | gpt_irq_acknowledge(); |
242 | 242 | ||