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/spear | |
| 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/spear')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/spear/timer.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index cbef34f..1dc7860 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -68,7 +68,9 @@ int timer_init(void) /* auto reload, start timer */ writel(readl(&gpt_regs_p->control) | GPT_ENABLE, &gpt_regs_p->control); - reset_timer_masked(); + /* Reset the timer */ + lastdec = READ_TIMER(); + timestamp = 0; return 0; } @@ -97,13 +99,6 @@ void __udelay(unsigned long usec) ; } -void reset_timer_masked(void) -{ - /* reset time */ - lastdec = READ_TIMER(); - timestamp = 0; -} - ulong get_timer_masked(void) { ulong now = READ_TIMER(); |