summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-09-05 05:55:59 +0000
committerWolfgang Denk <wd@denx.de>2011-09-07 22:03:06 +0200
commit6636eb97e4930bf753fd1461bedd11807c37fc85 (patch)
tree97b26cf7920de85dfa6c7ff57af9d0bae89952ec /arch
parent6f0d7ae26564a9beb429bb72b2ccf65e73816835 (diff)
downloadu-boot-imx-6636eb97e4930bf753fd1461bedd11807c37fc85.zip
u-boot-imx-6636eb97e4930bf753fd1461bedd11807c37fc85.tar.gz
u-boot-imx-6636eb97e4930bf753fd1461bedd11807c37fc85.tar.bz2
omap24xx: fix 'reset_timer_masked' declaration error
Commit 17659d7 "Timer: Remove reset_timer_masked()" introduced a static declaration for reset_timer_masked() which causes build errors: timer.c:45: error: static declaration of 'reset_timer_masked' follows non-static declaration include/asm/u-boot-arm.h:70: error: previous declaration of 'reset_timer_masked' was here Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Graeme Russ <graeme.russ@gmail.com> Cc: Cc: Albert ARIBAUD <albert.u.boot@aribaud.net> Cc: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/arm1136/omap24xx/timer.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index 73bf4a7..e929ae4 100644
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -41,13 +41,6 @@
DECLARE_GLOBAL_DATA_PTR;
-static void reset_timer_masked (void)
-{
- /* reset time */
- gd->lastinc = READ_TIMER; /* capture current incrementer value time */
- gd->tbl = 0; /* start "advancing" time stamp from 0 */
-}
-
int timer_init (void)
{
int32_t val;
@@ -57,7 +50,9 @@ int timer_init (void)
val = (CONFIG_SYS_PTV << 2) | BIT5 | BIT1 | BIT0; /* mask to enable timer*/
*((int32_t *) (CONFIG_SYS_TIMERBASE + TCLR)) = val; /* start timer */
- reset_timer_masked(); /* init the timestamp and lastinc value */
+ /* reset time */
+ gd->lastinc = READ_TIMER; /* capture current incrementer value */
+ gd->tbl = 0; /* start "advancing" time stamp */
return(0);
}
@@ -84,10 +79,13 @@ void __udelay (unsigned long usec)
}
tmp = get_timer (0); /* get current timestamp */
- if ( (tmo + tmp + 1) < tmp ) /* if setting this forward will roll time stamp */
- reset_timer_masked (); /* reset "advancing" timestamp to 0, set lastinc value */
- else
+ if ((tmo + tmp + 1) < tmp) { /* if setting this forward will roll */
+ /* time stamp, then reset time */
+ gd->lastinc = READ_TIMER; /* capture incrementer value */
+ gd->tbl = 0; /* start time stamp */
+ } else {
tmo += tmp; /* else, set advancing stamp wake up time */
+ }
while (get_timer_masked () < tmo)/* loop till event */
/*NOP*/;
}