arm: Move lastinc to arch_global_data

[karo-tx-uboot.git] / arch / arm / cpu / armv7 / omap-common / timer.c

diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c
index e321d53458d668251a9fa4169692f4c30e30b372..36bea5f94c118c8adeb69e83eb99800107c41921 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -56,7 +56,8 @@ int timer_init(void)
                &timer_base->tclr);
 
        /* reset time, capture current incrementer value time */
-       gd->lastinc = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ);
+       gd->arch.lastinc = readl(&timer_base->tcrr) /
+                                       (TIMER_CLOCK / CONFIG_SYS_HZ);
        gd->arch.tbl = 0;       /* start "advancing" time stamp from 0 */
 
        return 0;
@@ -91,14 +92,14 @@ ulong get_timer_masked(void)
        /* current tick value */
        ulong now = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ);
 
-       if (now >= gd->lastinc) {       /* normal mode (non roll) */
+       if (now >= gd->arch.lastinc) {  /* normal mode (non roll) */
                /* move stamp fordward with absoulte diff ticks */
-               gd->arch.tbl += (now - gd->lastinc);
+               gd->arch.tbl += (now - gd->arch.lastinc);
        } else {        /* we have rollover of incrementer */
                gd->arch.tbl += ((TIMER_LOAD_VAL / (TIMER_CLOCK /
-                               CONFIG_SYS_HZ)) - gd->lastinc) + now;
+                               CONFIG_SYS_HZ)) - gd->arch.lastinc) + now;
        }
-       gd->lastinc = now;
+       gd->arch.lastinc = now;
        return gd->arch.tbl;
 }