Skip to contentSkip to conversation

arm/plat-mxc: Fix forgotten renaming in timer.c

PATCH New Wolfram Sang 2 participants 2 messages Apr 23, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Wolfram Sang

author
#0 lore raw

PATCH 1/1 arm/plat-mxc: Fix forgotten renaming in timer.c

Commit "mxc: Change gpt timer code to be more generic by using V2 instead of MX3" forgot to replace one occurence causing a build failure.

Signed-off-by Wolfram Sang <[email protected]>
Cc Amit Kucheria <[email protected]>
Cc Sascha Hauer <[email protected]>
---
 arch/arm/plat-mxc/time.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-mxc/time.c +1 -1
index 714bdef..f9a1b05 100644
@@ -102,7 +102,7 @@ static void gpt_irq_acknowledge(void)
 			__raw_writel(MX2_TSTAT_CAPT | MX2_TSTAT_COMP,
 				timer_base + MX1_2_TSTAT);
 	} else if (timer_is_v2())
-		__raw_writel(MX3_TSTAT_OF1, timer_base + MX3_TSTAT);
+		__raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT);
 }
 
 static cycle_t mx1_2_get_cycles(struct clocksource *cs)
Signature · 1 line
1.7.0
#1 lore raw

PATCH 1/1 arm/plat-mxc: Fix forgotten renaming in timer.c

Quoted 7 lines · Wolfram Sang

Commit "mxc: Change gpt timer code to be more generic by using V2 instead of MX3" forgot to replace one occurence causing a build failure.

Signed-off-by Wolfram Sang <[email protected]>
Cc Amit Kucheria <[email protected]>
Cc Sascha Hauer <[email protected]>
Oops-Acked-by Amit Kucheria <[email protected]>

Thanks for the catch. :)

Quoted 20 lines
---
 arch/arm/plat-mxc/time.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-mxc/time.c +1 -1
index 714bdef..f9a1b05 100644
@@ -102,7 +102,7 @@ static void gpt_irq_acknowledge(void)
 			__raw_writel(MX2_TSTAT_CAPT | MX2_TSTAT_COMP,
 				timer_base + MX1_2_TSTAT);
 	} else if (timer_is_v2())
-		__raw_writel(MX3_TSTAT_OF1, timer_base + MX3_TSTAT);
+		__raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT);
 }
 
 static cycle_t mx1_2_get_cycles(struct clocksource *cs)
Signature · 1 line
1.7.0
Signature · 3 lines
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria at canonical.com
----------------------------------------------------------------------