diff options
author | Graeme Russ <graeme.russ@gmail.com> | 2011-07-15 02:21:14 +0000 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-07-26 14:54:15 +0200 |
commit | 17659d7de9e4905f8d06966c2354c87cdeb8b703 (patch) | |
tree | fc9971a9c9402efeb28c2e7e7cc3ffceba8041d8 /arch/arm/cpu/arm926ejs/pantheon | |
parent | 53fc43c68243d5278e522c92002fce3b8cc979a9 (diff) | |
download | u-boot-imx-17659d7de9e4905f8d06966c2354c87cdeb8b703.zip u-boot-imx-17659d7de9e4905f8d06966c2354c87cdeb8b703.tar.gz u-boot-imx-17659d7de9e4905f8d06966c2354c87cdeb8b703.tar.bz2 |
Timer: Remove reset_timer_masked()
In some circumstances, reset_timer_masked() was called be timer_init() in
order to perform architecture specific timer initialisation. In such
cases, the required code in reset_timer_masked() has been moved into
timer_init()
Diffstat (limited to 'arch/arm/cpu/arm926ejs/pantheon')
-rw-r--r-- | arch/arm/cpu/arm926ejs/pantheon/timer.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c index 2727adc..c71162a 100644 --- a/arch/arm/cpu/arm926ejs/pantheon/timer.c +++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c @@ -85,13 +85,6 @@ ulong read_timer(void) return val; } -void reset_timer_masked(void) -{ - /* reset time */ - gd->tbl = read_timer(); - gd->tbu = 0; -} - ulong get_timer_masked(void) { ulong now = read_timer(); @@ -151,7 +144,8 @@ int timer_init(void) /* Enable timer 0 */ writel(0x1, &panthtimers->cer); /* init the gd->tbu and gd->tbl value */ - reset_timer_masked(); + gd->tbl = read_timer(); + gd->tbu = 0; return 0; } |