diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:33 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:07:50 -0500 |
| commit | 8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d (patch) | |
| tree | 15e1efcbbead4e7612e8b084f9fcee4f0d5e2bd1 /arch/arm/cpu/arm926ejs/at91 | |
| parent | b339051c0d45599c3c874141c52d912d78991dd4 (diff) | |
| download | blackbird-obmc-uboot-8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d.tar.gz blackbird-obmc-uboot-8ff43b03e9f38a6e136e2e20eec4e8b2eb4a1d3d.zip | |
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/at91')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/timer.c b/arch/arm/cpu/arm926ejs/at91/timer.c index 061ccaf6c6..f691518c74 100644 --- a/arch/arm/cpu/arm926ejs/at91/timer.c +++ b/arch/arm/cpu/arm926ejs/at91/timer.c @@ -80,7 +80,7 @@ int timer_init(void) writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr); gd->arch.timer_rate_hz = gd->arch.mck_rate_hz / 16; - gd->tbu = gd->tbl = 0; + gd->arch.tbu = gd->tbl = 0; return 0; } @@ -96,9 +96,9 @@ unsigned long long get_ticks(void) /* increment tbu if tbl has rolled over */ if (now < gd->tbl) - gd->tbu++; + gd->arch.tbu++; gd->tbl = now; - return (((unsigned long long)gd->tbu) << 32) | gd->tbl; + return (((unsigned long long)gd->arch.tbu) << 32) | gd->tbl; } void __udelay(unsigned long usec) |
