GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-18 21:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

omap2420-h4: Fix get_timer() and CONFIG_SYS_HZ

Browse source 
The function get_timer() should return time in ms and CONFIG_SYS_HZ
should be set to 1000 by default. Fix both of these items.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
This commit is contained in:
Hunter, Jon 2013-04-03 09:35:36 +00:00 • committed by Tom Rini
parent faad9c0256
commit d1da76e9f8
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/cpu/arm1136/omap24xx/timer.c
View file

@ -31,13 +31,16 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/io.h>
#include <asm/arch/bits.h> #include <asm/arch/bits.h>
#include <asm/arch/omap2420.h> #include <asm/arch/omap2420.h>
#define TIMER_CLOCK (CONFIG_SYS_CLK_FREQ / (2 << CONFIG_SYS_PTV))
#define TIMER_LOAD_VAL 0 #define TIMER_LOAD_VAL 0
/* macro to read the 32 bit timer */ /* macro to read the 32 bit timer */
#define READ_TIMER (*((volatile ulong *)(CONFIG_SYS_TIMERBASE+TCRR))) #define READ_TIMER readl(CONFIG_SYS_TIMERBASE+TCRR) \
/ (TIMER_CLOCK / CONFIG_SYS_HZ)
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -99,7 +102,8 @@ ulong get_timer_masked (void)
gd->arch.tbl += (now - gd->arch.lastinc); gd->arch.tbl += (now - gd->arch.lastinc);
} else { } else {
/* we have rollover of incrementer */ /* we have rollover of incrementer */
gd->arch.tbl += (0xFFFFFFFF - gd->arch.lastinc) + now; gd->arch.tbl += ((0xFFFFFFFF / (TIMER_CLOCK / CONFIG_SYS_HZ))
- gd->arch.lastinc) + now;
} }
gd->arch.lastinc = now; gd->arch.lastinc = now;
return gd->arch.tbl; return gd->arch.tbl;

2
include/configs/omap2420h4.h
View file

@ -190,7 +190,7 @@
#define CONFIG_SYS_TIMERBASE OMAP2420_GPT2 #define CONFIG_SYS_TIMERBASE OMAP2420_GPT2
#define CONFIG_SYS_PTV V_PTV /* 2^(PTV+1) */ #define CONFIG_SYS_PTV V_PTV /* 2^(PTV+1) */
#define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV)) #define CONFIG_SYS_HZ 1000
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Physical Memory Map * Physical Memory Map