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/arm920t/ep93xx | |
| 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/arm920t/ep93xx')
| -rw-r--r-- | arch/arm/cpu/arm920t/ep93xx/timer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/cpu/arm920t/ep93xx/timer.c b/arch/arm/cpu/arm920t/ep93xx/timer.c index f19ec61..a3990a7 100644 --- a/arch/arm/cpu/arm920t/ep93xx/timer.c +++ b/arch/arm/cpu/arm920t/ep93xx/timer.c @@ -91,12 +91,6 @@ unsigned long get_timer(unsigned long base) return get_timer_masked() - base; } -void reset_timer_masked(void) -{ - read_timer(); - timer.ticks = 0; -} - void __udelay(unsigned long usec) { unsigned long long target; @@ -123,7 +117,9 @@ int timer_init(void) writel(TIMER_ENABLE | TIMER_CLKSEL, &timer_regs->timer3.control); - reset_timer_masked(); + /* Reset the timer */ + read_timer(); + timer.ticks = 0; return 0; } |