summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/u8500
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/arm/cpu/armv7/u8500
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/arm/cpu/armv7/u8500')
-rw-r--r--arch/arm/cpu/armv7/u8500/timer.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/u8500/timer.c b/arch/arm/cpu/armv7/u8500/timer.c
index bb9165b..a20897b 100644
--- a/arch/arm/cpu/armv7/u8500/timer.c
+++ b/arch/arm/cpu/armv7/u8500/timer.c
@@ -100,12 +100,14 @@ ulong get_timer_masked(void)
/* current tick value */
ulong now = TICKS_TO_HZ(READ_TIMER());
- if (now >= gd->lastinc) /* normal (non rollover) */
- gd->tbl += (now - gd->lastinc);
- else /* rollover */
- gd->tbl += (TICKS_TO_HZ(TIMER_LOAD_VAL) - gd->lastinc) + now;
+ if (now >= gd->lastinc) { /* normal (non rollover) */
+ gd->arch.tbl += (now - gd->lastinc);
+ } else { /* rollover */
+ gd->arch.tbl += (TICKS_TO_HZ(TIMER_LOAD_VAL) - gd->lastinc)
+ + now;
+ }
gd->lastinc = now;
- return gd->tbl;
+ return gd->arch.tbl;
}
/* Delay x useconds */