diff mbox

[U-Boot,1/1] omap3: bugfix in timer on rollover

Message ID 1465198811-44107-1-git-send-email-daniel.gorsulowski@esd.eu
State Accepted
Commit 85a2f772c256af9d8f0570548d2c2041a7b461e9
Delegated to: Tom Rini
Headers show

Commit Message

Daniel Gorsulowski June 6, 2016, 7:40 a.m. UTC 
Signed-off-by: Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
---
 arch/arm/cpu/armv7/omap-common/timer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini June 25, 2016, 2:51 a.m. UTC | #1 
On Mon, Jun 06, 2016 at 09:40:11AM +0200, Daniel Gorsulowski wrote:

> Signed-off-by: Daniel Gorsulowski <daniel.gorsulowski@esd.eu>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index 032bd2c..49e3a97 100644
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -77,7 +77,7 @@  ulong get_timer_masked(void)
 		/* move stamp fordward with absoulte diff ticks */
 		gd->arch.tbl += (now - gd->arch.lastinc);
 	} else {	/* we have rollover of incrementer */
-		gd->arch.tbl += ((TIMER_LOAD_VAL / (TIMER_CLOCK /
+		gd->arch.tbl += ((TIMER_OVERFLOW_VAL / (TIMER_CLOCK /
 				CONFIG_SYS_HZ)) - gd->arch.lastinc) + now;
 	}
 	gd->arch.lastinc = now;