diff options
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common/timer.c')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/timer.c | 11 | 
1 files changed, 3 insertions, 8 deletions
| diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c index 4756e2651..9f8bc9344 100644 --- a/arch/arm/cpu/armv7/omap-common/timer.c +++ b/arch/arm/cpu/armv7/omap-common/timer.c @@ -55,7 +55,9 @@ int timer_init(void)  	writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST,  		&timer_base->tclr); -	reset_timer_masked();	/* init the timestamp and lastinc value */ +	/* reset time, capture current incrementer value time */ +	gd->lastinc = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ); +	gd->tbl = 0;		/* start "advancing" time stamp from 0 */  	return 0;  } @@ -84,13 +86,6 @@ void __udelay(unsigned long usec)  	}  } -void reset_timer_masked(void) -{ -	/* reset time, capture current incrementer value time */ -	gd->lastinc = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ); -	gd->tbl = 0;		/* start "advancing" time stamp from 0 */ -} -  ulong get_timer_masked(void)  {  	/* current tick value */ |