From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Wed, 1 Feb 2012 20:57:52 -0600 Subject: [U-Boot] [PATCH 1/6] ARM: highbank: fix us_to_tick calculation In-Reply-To: <1328151477-8026-1-git-send-email-robherring2@gmail.com> References: <1328151477-8026-1-git-send-email-robherring2@gmail.com> Message-ID: <1328151477-8026-2-git-send-email-robherring2@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de From: Rob Herring udelay calls were off due to failing to convert us to ns. Fix this and drop the unnecessary shifts since NS_PER_TICK is only 7ns. Signed-off-by: Rob Herring --- arch/arm/cpu/armv7/highbank/timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/highbank/timer.c b/arch/arm/cpu/armv7/highbank/timer.c index d8a0288..d5b6cb6 100644 --- a/arch/arm/cpu/armv7/highbank/timer.c +++ b/arch/arm/cpu/armv7/highbank/timer.c @@ -66,10 +66,10 @@ static inline unsigned long long time_to_tick(unsigned long long time) static inline unsigned long long us_to_tick(unsigned long long us) { - unsigned long long tick = us << 16; + unsigned long long tick = us * 1000; tick += NS_PER_TICK - 1; do_div(tick, NS_PER_TICK); - return tick >> 16; + return tick; } unsigned long long get_ticks(void) -- 1.7.5.4