Move this field into arch_global_data and tidy up.
Signed-off-by: Simon Glass sjg@chromium.org --- Changes in v2: None
arch/arm/cpu/arm926ejs/davinci/timer.c | 4 ++-- arch/arm/include/asm/global_data.h | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c index b620bf7..4142932 100644 --- a/arch/arm/cpu/arm926ejs/davinci/timer.c +++ b/arch/arm/cpu/arm926ejs/davinci/timer.c @@ -61,7 +61,7 @@ int timer_init(void) writel(TIMER_LOAD_VAL, &timer->prd34); writel(2 << 22, &timer->tcr); gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK / TIM_CLK_DIV; - gd->timer_reset_value = 0; + gd->arch.timer_reset_value = 0;
return(0); } @@ -85,7 +85,7 @@ ulong get_timer(ulong base) { unsigned long long timer_diff;
- timer_diff = get_ticks() - gd->timer_reset_value; + timer_diff = get_ticks() - gd->arch.timer_reset_value;
return lldiv(timer_diff, (gd->arch.timer_rate_hz / CONFIG_SYS_HZ)) - base; diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 7d7f3cf..95e23e1 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -40,6 +40,7 @@ struct arch_global_data { unsigned long tbu; unsigned long tbl; unsigned long lastinc; + unsigned long long timer_reset_value; };
/* @@ -64,10 +65,6 @@ typedef struct global_data { #ifdef CONFIG_FSL_ESDHC unsigned long sdhc_clk; #endif -#ifdef CONFIG_ARM - /* "static data" needed by most of timer.c on ARM platforms */ - unsigned long long timer_reset_value; -#endif #ifdef CONFIG_IXP425 unsigned long timestamp; #endif