summaryrefslogtreecommitdiff
path: root/arch/mips/cpu/xburst
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:34 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commit66ee69234795c0596f84b25f06b7fbc2e8ed214c (patch)
treee67321700886c597591624f825379a2d76dbd99c /arch/mips/cpu/xburst
parent8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d (diff)
downloadu-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.zip
u-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.tar.gz
u-boot-imx-66ee69234795c0596f84b25f06b7fbc2e8ed214c.tar.bz2
arm: Move tbl to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/mips/cpu/xburst')
-rw-r--r--arch/mips/cpu/xburst/timer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/cpu/xburst/timer.c b/arch/mips/cpu/xburst/timer.c
index b6b3855..8ac8bf7 100644
--- a/arch/mips/cpu/xburst/timer.c
+++ b/arch/mips/cpu/xburst/timer.c
@@ -35,7 +35,7 @@ void reset_timer_masked(void)
{
/* reset time */
gd->lastinc = readl(&tcu->tcnt0);
- gd->tbl = 0;
+ gd->arch.tbl = 0;
}
ulong get_timer_masked(void)
@@ -43,15 +43,15 @@ ulong get_timer_masked(void)
ulong now = readl(&tcu->tcnt0);
if (gd->lastinc <= now)
- gd->tbl += now - gd->lastinc; /* normal mode */
+ gd->arch.tbl += now - gd->lastinc; /* normal mode */
else {
/* we have an overflow ... */
- gd->tbl += TIMER_FDATA + now - gd->lastinc;
+ gd->arch.tbl += TIMER_FDATA + now - gd->lastinc;
}
gd->lastinc = now;
- return gd->tbl;
+ return gd->arch.tbl;
}
void udelay_masked(unsigned long usec)
@@ -95,7 +95,7 @@ int timer_init(void)
writeb(1 << TIMER_CHAN, &tcu->tesr); /* start counting up */
gd->lastinc = 0;
- gd->tbl = 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)