summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs/lpc32xx
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@bootlin.com>2019-04-17 11:48:45 +0200
committerTom Rini <trini@konsulko.com>2019-04-26 18:58:20 -0400
commitc8aac24629dec56334c27d98e993d2b3bb481b25 (patch)
tree7bfd0091dd052b06901febe04368f32399f0516c /arch/arm/cpu/arm926ejs/lpc32xx
parent32dfc12b703faf9e6ab1e544a05ec5dba7d45449 (diff)
arm: lpc32xx: Fix timer initialization
The match controller register is not cleared during initialization. However, some bits of this register may reset the TC if tnMRx match it. As we can't make any assumption about how U-Boot is launched by the first stage bootloader (such as S1L) clearing this register ensure that the timers work as expected. Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs/lpc32xx')
-rw-r--r--arch/arm/cpu/arm926ejs/lpc32xx/timer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
index 404ccbb716..b3ca686040 100644
--- a/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/timer.c
@@ -33,6 +33,9 @@ static void lpc32xx_timer_reset(struct timer_regs *timer, u32 freq)
/* Set prescale counter value */
writel((get_periph_clk_rate() / freq) - 1, &timer->pr);
+
+ /* Ensure that the counter is not reset when matching TC */
+ writel(0, &timer->mcr);
}
static void lpc32xx_timer_count(struct timer_regs *timer, int enable)