summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm925t
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-07-15 02:21:14 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:54:15 +0200
commit17659d7de9e4905f8d06966c2354c87cdeb8b703 (patch)
treefc9971a9c9402efeb28c2e7e7cc3ffceba8041d8 /arch/arm/cpu/arm925t
parent53fc43c68243d5278e522c92002fce3b8cc979a9 (diff)
downloadu-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/arm925t')
-rw-r--r--arch/arm/cpu/arm925t/timer.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/arm/cpu/arm925t/timer.c b/arch/arm/cpu/arm925t/timer.c
index 9c965e0..1b9386b 100644
--- a/arch/arm/cpu/arm925t/timer.c
+++ b/arch/arm/cpu/arm925t/timer.c
@@ -56,7 +56,9 @@ int timer_init (void)
CONFIG_SYS_TIMERBASE + CNTL_TIMER);
/* init the timestamp and lastdec value */
- reset_timer_masked();
+ lastdec = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /
+ (TIMER_CLOCK / CONFIG_SYS_HZ);
+ timestamp = 0; /* start "advancing" time stamp from 0 */
return 0;
}
@@ -85,14 +87,6 @@ void __udelay (unsigned long usec)
}
}
-void reset_timer_masked (void)
-{
- /* reset time */
- lastdec = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /
- (TIMER_CLOCK / CONFIG_SYS_HZ);
- timestamp = 0; /* start "advancing" time stamp from 0 */
-}
-
ulong get_timer_masked (void)
{
uint32_t now = __raw_readl(CONFIG_SYS_TIMERBASE + READ_TIM) /