diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-18 08:27:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-18 08:27:23 -0400 |
| commit | 1977d72a69f3c8d97bd25a86a6be4da27cde3724 (patch) | |
| tree | 49b577aabdf7dc2483b895bc02ed560cfcf56535 | |
| parent | 4f2c559b9a2ad86e03dffeef720257ea680707d0 (diff) | |
| parent | 5996a8a8356c11c6eb504eeea93c267f9adbf53c (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: turris_omnia: Fix setting switch CONFIG pins on new board
design (Marek)
- orion-timer: Use timer_conv_64() to fix timer wrap around (Stefan)
| -rw-r--r-- | board/CZ.NIC/turris_omnia/turris_omnia.c | 2 | ||||
| -rw-r--r-- | drivers/timer/orion-timer.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c index a7f96e5b77..19c5043fcb 100644 --- a/board/CZ.NIC/turris_omnia/turris_omnia.c +++ b/board/CZ.NIC/turris_omnia/turris_omnia.c @@ -654,7 +654,7 @@ static void initialize_switch(void) ctrl[1] = EXT_CTL_nRES_LAN; err = omnia_mcu_write(CMD_EXT_CONTROL, ctrl, sizeof(ctrl)); - mdelay(10); + mdelay(50); /* Change RGMII pins back to RGMII mode */ diff --git a/drivers/timer/orion-timer.c b/drivers/timer/orion-timer.c index fd30e1bf03..d7d1a1b244 100644 --- a/drivers/timer/orion-timer.c +++ b/drivers/timer/orion-timer.c @@ -19,7 +19,7 @@ static uint64_t orion_timer_get_count(struct udevice *dev) { struct orion_timer_priv *priv = dev_get_priv(dev); - return ~readl(priv->base + TIMER0_VAL); + return timer_conv_64(~readl(priv->base + TIMER0_VAL)); } static int orion_timer_probe(struct udevice *dev) |