TX6 Release 2013-04-22

[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 c4c0e6e59ff1c5f079c597b7f4a2dca95fe7f002..2292ea0eafe4882adb8f2969cc7f6db60cfad4bd 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/timer.c
+++ b/arch/arm/cpu/armv7/omap-common/timer.c
@@ -101,9 +101,9 @@ int timer_init(void)
        writel(TCLR_VAL, &timer_base->tclr);
 #endif
 #ifndef CONFIG_SPL_BUILD
        writel(TCLR_VAL, &timer_base->tclr);
 #endif
 #ifndef CONFIG_SPL_BUILD

-       gd->lastinc = -30 * TIMER_CLOCK;
-       gd->tbl = TIMER_START;
-       gd->timer_rate_hz = TIMER_CLOCK;
+       gd->arch.lastinc = -30 * TIMER_CLOCK;
+       gd->arch.tbl = TIMER_START;
+       gd->arch.timer_rate_hz = TIMER_CLOCK;

 #endif
        return 0;
 }
 #endif
        return 0;
 }


@@ -145,11 +145,11 @@ ulong get_timer_masked(void)
 unsigned long long get_ticks(void)
 {
        ulong now = readl(&timer_base->tcrr);
 unsigned long long get_ticks(void)
 {
        ulong now = readl(&timer_base->tcrr);

-       ulong inc = now - gd->lastinc;
+       ulong inc = now - gd->arch.lastinc;

 
 

-       gd->tbl += inc;
-       gd->lastinc = now;
-       return gd->tbl;
+       gd->arch.tbl += inc;
+       gd->arch.lastinc = now;
+       return gd->arch.tbl;

 }
 
 /*
 }
 
 /*


@@ -158,5 +158,5 @@ unsigned long long get_ticks(void)
  */
 ulong get_tbclk(void)
 {
  */
 ulong get_tbclk(void)
 {

-       return gd->timer_rate_hz;
+       return gd->arch.timer_rate_hz;

 }
 }