summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs/armada100
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:33 +0000
committerTom Rini <trini@ti.com>2013-02-01 15:07:50 -0500
commit8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d (patch)
tree15e1efcbbead4e7612e8b084f9fcee4f0d5e2bd1 /arch/arm/cpu/arm926ejs/armada100
parentb339051c0d45599c3c874141c52d912d78991dd4 (diff)
downloadu-boot-imx-8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d.zip
u-boot-imx-8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d.tar.gz
u-boot-imx-8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d.tar.bz2
arm: Move tbu to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/armada100')
-rw-r--r--arch/arm/cpu/arm926ejs/armada100/timer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 355cd6d..18ffd0c 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -61,7 +61,7 @@ struct armd1tmr_registers {
#define COUNT_RD_REQ 0x1
DECLARE_GLOBAL_DATA_PTR;
-/* Using gd->tbu from timestamp and gd->tbl for lastdec */
+/* Using gd->arch.tbu from timestamp and gd->tbl for lastdec */
/* For preventing risk of instability in reading counter value,
* first set read request to register cvwr and then read same
@@ -84,14 +84,14 @@ ulong get_timer_masked(void)
if (now >= gd->tbl) {
/* normal mode */
- gd->tbu += now - gd->tbl;
+ gd->arch.tbu += now - gd->tbl;
} else {
/* we have an overflow ... */
- gd->tbu += now + TIMER_LOAD_VAL - gd->tbl;
+ gd->arch.tbu += now + TIMER_LOAD_VAL - gd->tbl;
}
gd->tbl = now;
- return gd->tbu;
+ return gd->arch.tbu;
}
ulong get_timer(ulong base)
@@ -135,9 +135,9 @@ int timer_init(void)
/* Enable timer 0 */
writel(0x1, &armd1timers->cer);
- /* init the gd->tbu and gd->tbl value */
+ /* init the gd->arch.tbu and gd->tbl value */
gd->tbl = read_timer();
- gd->tbu = 0;
+ gd->arch.tbu = 0;
return 0;
}