ARM: Realview/Versatile: remove useless TIMER_RELOAD calculations
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 14 Jan 2010 22:37:12 +0000 (22:37 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 May 2010 08:35:34 +0000 (09:35 +0100)
Realview/Versatile copied the Integrator timer code, including the
calculations for ensuring that the reload value fits into the 16-bit
counter.  However, these platforms have a 32-bit counter which is
clocked at a slower rate.

The result is that the preprocessor conditions are never triggered:
TICKS_PER_uSEC = 1, mSEC_10 = 10000, which is 0x2710 - less than
0x10000.

So, remove the unnecessary complexity, reducing the TIMER_RELOAD
calculation to just:

TICKS_PER_uSEC * mSEC_10

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/plat-versatile/timer-sp.c

index 98722f44640c7272c0e1e812efd440d6cb6e75d9..d1dbef5b17b181007358c34939ed79db673e0155 100644 (file)
 /*
  * How long is the timer interval?
  */
-#define TIMER_INTERVAL (TICKS_PER_uSEC * mSEC_10)
-#if TIMER_INTERVAL >= 0x100000
-#define TIMER_RELOAD   (TIMER_INTERVAL >> 8)
-#define TIMER_DIVISOR  (TIMER_CTRL_DIV256)
-#elif TIMER_INTERVAL >= 0x10000
-#define TIMER_RELOAD   (TIMER_INTERVAL >> 4)           /* Divide by 16 */
-#define TIMER_DIVISOR  (TIMER_CTRL_DIV16)
-#else
-#define TIMER_RELOAD   (TIMER_INTERVAL)
-#define TIMER_DIVISOR  (TIMER_CTRL_DIV1)
-#endif
+#define TIMER_RELOAD   (TICKS_PER_uSEC * mSEC_10)
 
 
 static void __iomem *clksrc_base;