diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-09-18 15:32:34 +0300 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-09-28 18:50:56 +0300 |
| commit | 77b11f7604162886f46e56011e790b7700f8cadd (patch) | |
| tree | ab58a658085e4b2db03f2e5a76ddec06fa59a259 /drivers/net/fm | |
| parent | a17776be1dbe91684a9d0c60f623e9243e43fea9 (diff) | |
| download | u-boot-77b11f7604162886f46e56011e790b7700f8cadd.zip u-boot-77b11f7604162886f46e56011e790b7700f8cadd.tar.gz u-boot-77b11f7604162886f46e56011e790b7700f8cadd.tar.bz2 | |
net: replace the "xfi" phy-mode with "10gbase-r"
As part of the effort of making U-Boot work with the same device tree as
Linux, there is an issue with the "xfi" phy-mode. To be precise, in
Linux there was a discussion (for those who have time to read:
https://lore.kernel.org/netdev/1576768881-24971-2-git-send-email-madalin.bucur@oss.nxp.com/)
which led to a patch:
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=c114574ebfdf42f826776f717c8056a00fa94881
TL;DR: "xfi" was standardized in Linux as "10gbase-r".
This patch changes the relevant occurrences in U-Boot to use "10gbase-r"
instead of "xfi" wherever applicable.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
Diffstat (limited to 'drivers/net/fm')
| -rw-r--r-- | drivers/net/fm/b4860.c | 2 | ||||
| -rw-r--r-- | drivers/net/fm/memac.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index 5be0ad2..6e3d008 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -100,7 +100,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) env_get_f("hwconfig", buffer, sizeof(buffer)); buf = buffer; - /* check if XFI interface enable in hwconfig for 10g */ + /* check if 10GBase-R interface enable in hwconfig for 10g */ if (hwconfig_subarg_cmp_f("fsl_b4860_serdes2", "sfp_amc", "sfp", buf)) { if ((port == FM1_10GEC1 || diff --git a/drivers/net/fm/memac.c b/drivers/net/fm/memac.c index 36f50d2..e1f812b 100644 --- a/drivers/net/fm/memac.c +++ b/drivers/net/fm/memac.c @@ -98,7 +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_10GBASER: case PHY_INTERFACE_MODE_XGMII: if_mode &= ~IF_MODE_MASK; if_mode |= IF_MODE_XGMII; @@ -107,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 && type != PHY_INTERFACE_MODE_XFI) + if (type != PHY_INTERFACE_MODE_XGMII && type != PHY_INTERFACE_MODE_10GBASER) if_mode |= IF_MODE_EN_AUTO; if (type == PHY_INTERFACE_MODE_RGMII || |