aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-04-29 13:55:13 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-05-07 16:20:28 +0200
commit81ec1f929fe5be3f6464edf7939a9b65fc8223ca (patch)
tree9d995fa45ff6f418d8926b5371924fe811c8b90c
parent74fe030e63bd9e4adc5a67128d4c8359b37df55d (diff)
mxc: fix wrong register access in timer code
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/plat-mxc/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index 85f002e7f1e..88fb3a57e02 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)
uint32_t tstat;
if (cpu_is_mx3())
- tstat = __raw_readl(timer_base + MX1_2_TSTAT);
- else
tstat = __raw_readl(timer_base + MX3_TSTAT);
+ else
+ tstat = __raw_readl(timer_base + MX1_2_TSTAT);
gpt_irq_acknowledge();