summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:36 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commit5f70714c2feb94318f2c2a153f4089e32f353548 (patch)
treee60c0721297f8bf8d30d8c797f0e4b3d09716d7f
parent582601da2f90b1850aa19f7820b1623c79b3dac6 (diff)
downloadu-boot-imx-5f70714c2feb94318f2c2a153f4089e32f353548.zip
u-boot-imx-5f70714c2feb94318f2c2a153f4089e32f353548.tar.gz
u-boot-imx-5f70714c2feb94318f2c2a153f4089e32f353548.tar.bz2
arm: Move timer_reset_value to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/timer.c4
-rw-r--r--arch/arm/include/asm/global_data.h5
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 d7d4743..ea27c16 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