From 6842ee749fff8609cdc05fa8f19ae7da8e43fcd8 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 14 Jan 2010 22:37:12 +0000 Subject: [PATCH] --- yaml --- r: 191819 b: refs/heads/master c: fe8e1a57f0ccdaede41618ca9ced7d746b6298d3 h: refs/heads/master i: 191817: c398e00d4366396db18170feb71d6f7e43e05945 191815: 5ba55a73ae13de8c58db2c96fefc1c4fe4711de5 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-versatile/timer-sp.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 5d71714bdd2a..1125cd879818 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e388771458b4ff3ad81ab70e390b24d069647da4 +refs/heads/master: fe8e1a57f0ccdaede41618ca9ced7d746b6298d3 diff --git a/trunk/arch/arm/plat-versatile/timer-sp.c b/trunk/arch/arm/plat-versatile/timer-sp.c index 98722f44640c..d1dbef5b17b1 100644 --- a/trunk/arch/arm/plat-versatile/timer-sp.c +++ b/trunk/arch/arm/plat-versatile/timer-sp.c @@ -33,17 +33,7 @@ /* * 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;