diff options
Diffstat (limited to 'arch/mips/cpu/xburst/timer.c')
| -rw-r--r-- | arch/mips/cpu/xburst/timer.c | 20 | 
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/cpu/xburst/timer.c b/arch/mips/cpu/xburst/timer.c index b6b3855ea..8c33d3ca3 100644 --- a/arch/mips/cpu/xburst/timer.c +++ b/arch/mips/cpu/xburst/timer.c @@ -34,24 +34,24 @@ static struct jz4740_tcu *tcu = (struct jz4740_tcu *)JZ4740_TCU_BASE;  void reset_timer_masked(void)  {  	/* reset time */ -	gd->lastinc = readl(&tcu->tcnt0); -	gd->tbl = 0; +	gd->arch.lastinc = readl(&tcu->tcnt0); +	gd->arch.tbl = 0;  }  ulong get_timer_masked(void)  {  	ulong now = readl(&tcu->tcnt0); -	if (gd->lastinc <= now) -		gd->tbl += now - gd->lastinc; /* normal mode */ +	if (gd->arch.lastinc <= now) +		gd->arch.tbl += now - gd->arch.lastinc; /* normal mode */  	else {  		/* we have an overflow ... */ -		gd->tbl += TIMER_FDATA + now - gd->lastinc; +		gd->arch.tbl += TIMER_FDATA + now - gd->arch.lastinc;  	} -	gd->lastinc = now; +	gd->arch.lastinc = now; -	return gd->tbl; +	return gd->arch.tbl;  }  void udelay_masked(unsigned long usec) @@ -94,8 +94,8 @@ int timer_init(void)  	writel(1 << TIMER_CHAN, &tcu->tscr); /* enable timer clock */  	writeb(1 << TIMER_CHAN, &tcu->tesr); /* start counting up */ -	gd->lastinc = 0; -	gd->tbl = 0; +	gd->arch.lastinc = 0; +	gd->arch.tbl = 0;  	return 0;  } @@ -112,7 +112,7 @@ ulong get_timer(ulong base)  void set_timer(ulong t)  { -	gd->tbl = t; +	gd->arch.tbl = t;  }  void __udelay(unsigned long usec)  |