mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-28 10:01:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-marvell

Browse Source 
- 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)
This commit is contained in:
Tom Rini 2022-09-18 08:27:23 -04:00
commit 1977d72a69
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -654,7 +654,7 @@ static void initialize_switch(void)
ctrl[1] = EXT_CTL_nRES_LAN; ctrl[1] = EXT_CTL_nRES_LAN;
err = omnia_mcu_write(CMD_EXT_CONTROL, ctrl, sizeof(ctrl)); err = omnia_mcu_write(CMD_EXT_CONTROL, ctrl, sizeof(ctrl));
mdelay(10); mdelay(50);
/* Change RGMII pins back to RGMII mode */ /* Change RGMII pins back to RGMII mode */

2
drivers/timer/orion-timer.c
View File

@ -19,7 +19,7 @@ static uint64_t orion_timer_get_count(struct udevice *dev)
{ {
struct orion_timer_priv *priv = dev_get_priv(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) static int orion_timer_probe(struct udevice *dev)