diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:35 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:07:50 -0500 |
| commit | 582601da2f90b1850aa19f7820b1623c79b3dac6 (patch) | |
| tree | 9ed77bb4cd2a7a9fcd12d6edc18ed71e06ffe1a9 /arch/arm/cpu/ixp/timer.c | |
| parent | 66ee69234795c0596f84b25f06b7fbc2e8ed214c (diff) | |
| download | olio-uboot-2014.01-582601da2f90b1850aa19f7820b1623c79b3dac6.tar.xz olio-uboot-2014.01-582601da2f90b1850aa19f7820b1623c79b3dac6.zip | |
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/ixp/timer.c')
| -rw-r--r-- | arch/arm/cpu/ixp/timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/cpu/ixp/timer.c b/arch/arm/cpu/ixp/timer.c index 087ddf80e..0450b5103 100644 --- a/arch/arm/cpu/ixp/timer.c +++ b/arch/arm/cpu/ixp/timer.c @@ -70,13 +70,13 @@ unsigned long long get_ticks(void) if (readl(IXP425_OSST) & IXP425_OSST_TIMER_TS_PEND) { /* rollover of timestamp timer register */ - gd->timestamp += (0xFFFFFFFF - gd->lastinc) + now + 1; + gd->timestamp += (0xFFFFFFFF - gd->arch.lastinc) + now + 1; writel(IXP425_OSST_TIMER_TS_PEND, IXP425_OSST); } else { /* move stamp forward with absolut diff ticks */ - gd->timestamp += (now - gd->lastinc); + gd->timestamp += (now - gd->arch.lastinc); } - gd->lastinc = now; + gd->arch.lastinc = now; return gd->timestamp; } @@ -84,7 +84,7 @@ unsigned long long get_ticks(void) void reset_timer_masked(void) { /* capture current timestamp counter */ - gd->lastinc = readl(IXP425_OSTS_B); + gd->arch.lastinc = readl(IXP425_OSTS_B); /* start "advancing" time stamp from 0 */ gd->timestamp = 0; } |