From: Li Haibo <hbli@sinocastel.com>
Date: Tue, 10 Aug 2010 06:18:38 +0000 (+0800)
Subject: MX51EVK: fix return value of get_timer_masked
X-Git-Tag: v2010.09-rc1~1^2~12^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b5870bdc837359299d22e8af48f315bd65d5fd;p=kernel%2Fu-boot.git

MX51EVK: fix return value of get_timer_masked

get_timer_masked() should return current timestamp,
not current ticks from hardware register.

Tested on one custom board with NAND flash.
Without this patch, NAND write always TIMEOUT
because get_timer(0) return a big value.

This patch applies for u-boot-2010.06

Signed-off-by: Li Haibo <hbli@sinocastel.com>
---

diff --git a/arch/arm/cpu/armv7/mx51/timer.c b/arch/arm/cpu/armv7/mx51/timer.c
index 81c4a06..110edbf 100644
--- a/arch/arm/cpu/armv7/mx51/timer.c
+++ b/arch/arm/cpu/armv7/mx51/timer.c
@@ -89,7 +89,7 @@ ulong get_timer_masked(void)
 		timestamp += ((0xFFFFFFFF / (CONFIG_MX51_CLK32 / CONFIG_SYS_HZ))
 				- lastinc) + val;
 	lastinc = val;
-	return val;
+	return timestamp;
 }
 
 ulong get_timer(ulong base)