omap5912-osk: Fix get_timer() and CONFIG_SYS_HZ
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:
parent
54ef1f6774
commit
eef6da0326
|
@ -36,11 +36,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <asm/io.h>
|
||||||
|
|
||||||
#define TIMER_LOAD_VAL 0xffffffff
|
#define TIMER_CLOCK (CONFIG_SYS_CLK_FREQ / (2 << CONFIG_SYS_PTV))
|
||||||
|
#define TIMER_LOAD_VAL 0xffffffff
|
||||||
|
|
||||||
/* macro to read the 32 bit timer */
|
/* macro to read the 32 bit timer */
|
||||||
#define READ_TIMER (*(volatile ulong *)(CONFIG_SYS_TIMERBASE+8))
|
#define READ_TIMER readl(CONFIG_SYS_TIMERBASE+8) \
|
||||||
|
/ (TIMER_CLOCK / CONFIG_SYS_HZ)
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
|
@ -114,7 +117,8 @@ ulong get_timer_masked (void)
|
||||||
* (TLV-now) amount of time after passing though -1
|
* (TLV-now) amount of time after passing though -1
|
||||||
* nts = new "advancing time stamp"...it could also roll and cause problems.
|
* nts = new "advancing time stamp"...it could also roll and cause problems.
|
||||||
*/
|
*/
|
||||||
timestamp += lastdec + TIMER_LOAD_VAL - now;
|
timestamp += lastdec + (TIMER_LOAD_VAL / (TIMER_CLOCK /
|
||||||
|
CONFIG_SYS_HZ)) - now;
|
||||||
}
|
}
|
||||||
lastdec = now;
|
lastdec = now;
|
||||||
|
|
||||||
|
@ -160,8 +164,5 @@ unsigned long long get_ticks(void)
|
||||||
*/
|
*/
|
||||||
ulong get_tbclk (void)
|
ulong get_tbclk (void)
|
||||||
{
|
{
|
||||||
ulong tbclk;
|
return CONFIG_SYS_HZ;
|
||||||
|
|
||||||
tbclk = CONFIG_SYS_HZ;
|
|
||||||
return tbclk;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -134,7 +134,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_SYS_TIMERBASE 0xFFFEC500 /* use timer 1 */
|
#define CONFIG_SYS_TIMERBASE 0xFFFEC500 /* use timer 1 */
|
||||||
#define CONFIG_SYS_PTV 7 /* 2^(PTV+1), divide by 256 */
|
#define CONFIG_SYS_PTV 7 /* 2^(PTV+1), divide by 256 */
|
||||||
#define CONFIG_SYS_HZ ((CONFIG_SYS_CLK_FREQ)/(2 << CONFIG_SYS_PTV))
|
#define CONFIG_SYS_HZ 1000
|
||||||
|
|
||||||
/*-----------------------------------------------------------------------
|
/*-----------------------------------------------------------------------
|
||||||
* Physical Memory Map
|
* Physical Memory Map
|
||||||
|
|
Loading…
Reference in New Issue