diff options
author | Simon Glass <sjg@chromium.org> | 2012-12-14 00:48:35 +0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-02-02 00:07:50 +0400 |
commit | 582601da2f90b1850aa19f7820b1623c79b3dac6 (patch) | |
tree | 9ed77bb4cd2a7a9fcd12d6edc18ed71e06ffe1a9 /arch/arm/cpu/armv7/s5p-common | |
parent | 66ee69234795c0596f84b25f06b7fbc2e8ed214c (diff) | |
download | u-boot-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/s5p-common')
-rw-r--r-- | arch/arm/cpu/armv7/s5p-common/timer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 1566226386..e78c716d3f 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -105,7 +105,7 @@ void reset_timer_masked(void) struct s5p_timer *const timer = s5p_get_base_timer(); /* reset time */ - gd->lastinc = readl(&timer->tcnto4); + gd->arch.lastinc = readl(&timer->tcnto4); gd->arch.tbl = 0; } @@ -123,12 +123,12 @@ unsigned long get_current_tick(void) unsigned long now = readl(&timer->tcnto4); unsigned long count_value = readl(&timer->tcntb4); - if (gd->lastinc >= now) - gd->arch.tbl += gd->lastinc - now; + if (gd->arch.lastinc >= now) + gd->arch.tbl += gd->arch.lastinc - now; else - gd->arch.tbl += gd->lastinc + count_value - now; + gd->arch.tbl += gd->arch.lastinc + count_value - now; - gd->lastinc = now; + gd->arch.lastinc = now; return gd->arch.tbl; } |