Merge git://git.denx.de/u-boot

[u-boot] / arch / arm / cpu / arm1136 / omap24xx / timer.c

diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c b/arch/arm/cpu/arm1136/omap24xx/timer.c
index d6267ba72ea52b78da4cb928975ae40af814f386..e929ae45bbf7023248608d3cf055692da423fc7f 100644 (file)
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -50,18 +50,15 @@ 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);
 }
 /*
  * timer without interrupts
  */
-void reset_timer (void)
-{
-       reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
        return get_timer_masked () - base;
@@ -82,21 +79,17 @@ 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*/;
 }
 
-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 */
-}
-
 ulong get_timer_masked (void)
 {
        ulong now = READ_TIMER;         /* current tick value */