* [U-Boot] [PATCH 1/1] omap3: bugfix in timer on rollover
@ 2016-06-06 7:40 Daniel Gorsulowski
2016-06-25 2:51 ` [U-Boot] [U-Boot,1/1] " Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Gorsulowski @ 2016-06-06 7:40 UTC (permalink / raw)
To: u-boot
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(-)
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;
--
2.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [U-Boot,1/1] omap3: bugfix in timer on rollover
2016-06-06 7:40 [U-Boot] [PATCH 1/1] omap3: bugfix in timer on rollover Daniel Gorsulowski
@ 2016-06-25 2:51 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2016-06-25 2:51 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160624/2ac9ca4f/attachment.sig>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-25 2:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-06 7:40 [U-Boot] [PATCH 1/1] omap3: bugfix in timer on rollover Daniel Gorsulowski
2016-06-25 2:51 ` [U-Boot] [U-Boot,1/1] " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox