From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 29 Apr 2009 11:55:13 +0000 (+0200)
Subject: mxc: fix wrong register access in timer code
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=81ec1f929fe5be3f6464edf7939a9b65fc8223ca;p=deliverable%2Flinux.git

mxc: fix wrong register access in timer code

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

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)
 	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();