diff options
Diffstat (limited to 'arch/arm/cpu/arm926ejs/spear/timer.c')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/spear/timer.c | 11 | 
1 files changed, 3 insertions, 8 deletions
| diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index cbef34fab..1dc78600c 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -68,7 +68,9 @@ int timer_init(void)  	/* auto reload, start timer */  	writel(readl(&gpt_regs_p->control) | GPT_ENABLE, &gpt_regs_p->control); -	reset_timer_masked(); +	/* Reset the timer */ +	lastdec = READ_TIMER(); +	timestamp = 0;  	return 0;  } @@ -97,13 +99,6 @@ void __udelay(unsigned long usec)  		;  } -void reset_timer_masked(void) -{ -	/* reset time */ -	lastdec = READ_TIMER(); -	timestamp = 0; -} -  ulong get_timer_masked(void)  {  	ulong now = READ_TIMER(); |