diff options
| author | Tom Rini <[email protected]> | 2020-05-14 08:43:33 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-14 08:43:33 -0400 |
| commit | fe16786149c8f1b2db95ed614a760bc443da6472 (patch) | |
| tree | f752f84e6e532497b167cb51b65e132993618c9b /drivers/net | |
| parent | cae802924e423900df24dc58f382896ceb42a54b (diff) | |
| parent | 82aef6c6f8a74a0595501bfbb2f6f763c786324f (diff) | |
Merge tag 'rpi-next-2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot-raspberrypi
- fix phy configuration for RPi4's bcmgenet
- sync RPi4's env size with other RPi configs
- add kconfig option to reserver more pages in the EFI mem map
- add support for SDMA which is used by RPi4
- fix corner case boot bug for RPi3 32-bit
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bcmgenet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/bcmgenet.c b/drivers/net/bcmgenet.c index 8f4848aec68..e971b556acd 100644 --- a/drivers/net/bcmgenet.c +++ b/drivers/net/bcmgenet.c @@ -448,7 +448,10 @@ static int bcmgenet_adjust_link(struct bcmgenet_eth_priv *priv) } clrsetbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, OOB_DISABLE, - RGMII_LINK | RGMII_MODE_EN | ID_MODE_DIS); + RGMII_LINK | RGMII_MODE_EN); + + if (phy_dev->interface == PHY_INTERFACE_MODE_RGMII) + setbits_32(priv->mac_reg + EXT_RGMII_OOB_CTRL, ID_MODE_DIS); writel(speed << CMD_SPEED_SHIFT, (priv->mac_reg + UMAC_CMD)); |