minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 12:13:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

arm: Move timer_reset_value to arch_global_data

Browse Source 
Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:48:36 +00:00 committed by Tom Rini
parent 582601da2f
commit 5f70714c2f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/arm926ejs/davinci/timer.c
View File

@ -61,7 +61,7 @@ int timer_init(void)
writel(TIMER_LOAD_VAL, &timer->prd34); writel(TIMER_LOAD_VAL, &timer->prd34);
writel(2 << 22, &timer->tcr); writel(2 << 22, &timer->tcr);
gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK / TIM_CLK_DIV; 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); return(0);
} }
@ -85,7 +85,7 @@ ulong get_timer(ulong base)
{ {
unsigned long long timer_diff; 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, return lldiv(timer_diff,
(gd->arch.timer_rate_hz / CONFIG_SYS_HZ)) - base; (gd->arch.timer_rate_hz / CONFIG_SYS_HZ)) - base;

5
arch/arm/include/asm/global_data.h
View File

@ -40,6 +40,7 @@ struct arch_global_data {
unsigned long tbu; unsigned long tbu;
unsigned long tbl; unsigned long tbl;
unsigned long lastinc; unsigned long lastinc;
unsigned long long timer_reset_value;
}; };
/* /*
@ -64,10 +65,6 @@ typedef struct global_data {
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC
unsigned long sdhc_clk; unsigned long sdhc_clk;
#endif #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 #ifdef CONFIG_IXP425
unsigned long timestamp; unsigned long timestamp;
#endif #endif