diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:35 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 20:07:50 (GMT) |
| commit | 582601da2f90b1850aa19f7820b1623c79b3dac6 (patch) | |
| tree | 9ed77bb4cd2a7a9fcd12d6edc18ed71e06ffe1a9 /arch/arm/cpu/armv7/u8500 | |
| parent | 66ee69234795c0596f84b25f06b7fbc2e8ed214c (diff) | |
| download | u-boot-fsl-qoriq-582601da2f90b1850aa19f7820b1623c79b3dac6.tar.xz | |
arm: Move lastinc 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.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/u8500/timer.c b/arch/arm/cpu/armv7/u8500/timer.c index a20897b..a4b88f3 100644 --- a/arch/arm/cpu/armv7/u8500/timer.c +++ b/arch/arm/cpu/armv7/u8500/timer.c @@ -100,13 +100,13 @@ ulong get_timer_masked(void) /* current tick value */ ulong now = TICKS_TO_HZ(READ_TIMER()); - if (now >= gd->lastinc) { /* normal (non rollover) */ - gd->arch.tbl += (now - gd->lastinc); + if (now >= gd->arch.lastinc) { /* normal (non rollover) */ + gd->arch.tbl += (now - gd->arch.lastinc); } else { /* rollover */ - gd->arch.tbl += (TICKS_TO_HZ(TIMER_LOAD_VAL) - gd->lastinc) - + now; + gd->arch.tbl += (TICKS_TO_HZ(TIMER_LOAD_VAL) - + gd->arch.lastinc) + now; } - gd->lastinc = now; + gd->arch.lastinc = now; return gd->arch.tbl; } |