diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-27 17:42:36 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-27 17:42:36 +0300 |
| commit | 6b8e57338f3c5b65fa5b883fa3f87124f11a9e19 (patch) | |
| tree | 222892e528eed7e9785a444e765014fa320bba2b /arch/arm/cpu | |
| parent | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (diff) | |
| parent | fc1fe01b08cedd77a194bb82fa81af4fe1e39031 (diff) | |
| download | u-boot-6b8e57338f3c5b65fa5b883fa3f87124f11a9e19.tar.xz | |
Merge branch '2019-04-27-master-imports'
- Various vexpress, taurus, da850evm, lpc32xx, brxre1 fixes/updates
- btrfs fixes
- Add AM65x HS EVM
- Other small fixes
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/lpc32xx/timer.c | 3 |
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) |