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/pxa | |
| 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/pxa')
| -rw-r--r-- | arch/arm/cpu/pxa/timer.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/cpu/pxa/timer.c b/arch/arm/cpu/pxa/timer.c index 44dae9a..2866745 100644 --- a/arch/arm/cpu/pxa/timer.c +++ b/arch/arm/cpu/pxa/timer.c @@ -59,7 +59,7 @@ static inline unsigned long long us_to_tick(unsigned long long us) int timer_init (void) { - reset_timer_masked(); + writel(0, OSCR); return 0; } @@ -74,12 +74,6 @@ void __udelay (unsigned long usec) udelay_masked (usec); } - -void reset_timer_masked (void) -{ - writel(0, OSCR); -} - ulong get_timer_masked (void) { return tick_to_time(get_ticks()); |