diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:34 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:07:50 -0500 |
| commit | 66ee69234795c0596f84b25f06b7fbc2e8ed214c (patch) | |
| tree | e67321700886c597591624f825379a2d76dbd99c /arch/arm/cpu/arm1136/mx31/timer.c | |
| parent | 8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d (diff) | |
| download | talos-obmc-uboot-66ee69234795c0596f84b25f06b7fbc2e8ed214c.tar.gz talos-obmc-uboot-66ee69234795c0596f84b25f06b7fbc2e8ed214c.zip | |
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/arm1136/mx31/timer.c')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx31/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c index 86916d1edb..790bab457c 100644 --- a/arch/arm/cpu/arm1136/mx31/timer.c +++ b/arch/arm/cpu/arm1136/mx31/timer.c @@ -117,11 +117,11 @@ unsigned long long get_ticks(void) if (now >= gd->lastinc) /* normal mode (non roll) */ /* move stamp forward with absolut diff ticks */ - gd->tbl += (now - gd->lastinc); + gd->arch.tbl += (now - gd->lastinc); else /* we have rollover of incrementer */ - gd->tbl += (0xFFFFFFFF - gd->lastinc) + now; + gd->arch.tbl += (0xFFFFFFFF - gd->lastinc) + now; gd->lastinc = now; - return gd->tbl; + return gd->arch.tbl; } ulong get_timer_masked(void) |
