diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-25 12:55:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-25 12:55:06 -0400 |
| commit | 253388acd6d0d52205ed9a32282f990e055bb87d (patch) | |
| tree | a84e1d53a94b4ea3dbf1d1994ebf02606aa41503 /drivers/net/fm | |
| parent | 1da91d9bcd6e5ef046c1df0d373d0df87b1e8a72 (diff) | |
| parent | 8ec619f8fd847eb80d75fa0a582e1fa3c74a21a7 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Bug fixes related to PCIe, pfe, xfi, gpio, reset, vid, env, and usb on
layerscape products
Diffstat (limited to 'drivers/net/fm')
| -rw-r--r-- | drivers/net/fm/memac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index 0f0f7b0732..36f50d2782 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -98,6 +98,7 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, if_mode &= ~IF_MODE_MASK; if_mode |= (IF_MODE_GMII); break; + case PHY_INTERFACE_MODE_XFI: case PHY_INTERFACE_MODE_XGMII: if_mode &= ~IF_MODE_MASK; if_mode |= IF_MODE_XGMII; @@ -106,7 +107,7 @@ static void memac_set_interface_mode(struct fsl_enet_mac *mac, break; } /* Enable automatic speed selection for Non-XGMII */ - if (type != PHY_INTERFACE_MODE_XGMII) + if (type != PHY_INTERFACE_MODE_XGMII && type != PHY_INTERFACE_MODE_XFI) if_mode |= IF_MODE_EN_AUTO; if (type == PHY_INTERFACE_MODE_RGMII || |