| Message ID | 20190417094845.21639-1-gregory.clement@bootlin.com |
|---|---|
| State | Accepted |
| Commit | c8aac24629dec56334c27d98e993d2b3bb481b25 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] arm: lpc32xx: Fix timer initialization | expand |
On Wed, Apr 17, 2019 at 11:48:45AM +0200, Gregory CLEMENT wrote: > 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> Applied to u-boot/master, thanks!
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)
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> --- arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 3 +++ 1 file changed, 3 insertions(+)