---

yaml --- r: 123849 b: refs/heads/master c: c652d2d h: refs/heads/master i: 123847: 178bb84 v: v3
git-mirror · Dec 15, 2008 · e8fd81a · e8fd81a
1 parent 915ecff
commit e8fd81a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b31d8b2256db3ed825a63603f223f84d927ca39
+refs/heads/master: c652d2ddb97ccdc4774e149ef998928263fd8886
diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/tick.h b/trunk/arch/arm/mach-s3c6400/include/mach/tick.h
@@ -24,4 +24,6 @@ static inline u32 s3c24xx_ostimer_pending(void)
 	return pend & 1 << (IRQ_TIMER4_VIC - S3C64XX_IRQ_VIC0(0));
 }
 
+#define TICK_MAX	(0xffffffff)
+
 #endif /* __ASM_ARCH_6400_TICK_H */
diff --git a/trunk/arch/arm/plat-s3c/time.c b/trunk/arch/arm/plat-s3c/time.c
@@ -44,6 +44,10 @@
 static unsigned long timer_startval;
 static unsigned long timer_usec_ticks;
 
+#ifndef TICK_MAX
+#define TICK_MAX (0xffff)
+#endif
+
 #define TIMER_USEC_SHIFT 16
 
 /* we use the shifted arithmetic to work out the ratio of timer ticks
@@ -156,7 +160,7 @@ static void s3c2410_timer_setup (void)
 	unsigned long tcfg1;
 	unsigned long tcfg0;
 
-	tcnt = 0xffff;  /* default value for tcnt */
+	tcnt = TICK_MAX;  /* default value for tcnt */
 
 	/* read the current timer configuration bits */
 
@@ -217,7 +221,7 @@ static void s3c2410_timer_setup (void)
 	       tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);
 
 	/* check to see if timer is within 16bit range... */
-	if (tcnt > 0xffff) {
+	if (tcnt > TICK_MAX) {
 		panic("setup_timer: HZ is too small, cannot configure timer!");
 		return;
 	}