diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-17 08:10:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-17 08:10:56 -0500 |
| commit | 6d03688e75041a7bae4d33815de28da781c37dd6 (patch) | |
| tree | 2835b96e2b8ed807e572fa95b5c6190ad13e53c8 /drivers/timer/orion-timer.c | |
| parent | 4a986156258d456237d0dda753a39afbddf9dcfd (diff) | |
| parent | bee23537bab6934af3f791220be274ce9f4eb948 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- kirkwood: Convert to DM Serial for various Kirkwood boards (Tony)
- orion-timer: Fix problem in early_init_done() (Stefan)
Diffstat (limited to 'drivers/timer/orion-timer.c')
| -rw-r--r-- | drivers/timer/orion-timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/timer/orion-timer.c b/drivers/timer/orion-timer.c index 810a03d5496..9cab27f2e48 100644 --- a/drivers/timer/orion-timer.c +++ b/drivers/timer/orion-timer.c @@ -25,7 +25,8 @@ struct orion_timer_priv { static bool early_init_done(void *base) { - if (readl(base + TIMER_CTRL) & TIMER0_EN) + if ((readl(base + TIMER_CTRL) & TIMER0_EN) && + (readl(base + TIMER0_RELOAD) == ~0)) return true; return false; } |