diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-15 08:09:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-15 08:10:32 -0400 |
| commit | 7f418ea59852945eeb9e5d2555d306f09643d555 (patch) | |
| tree | 069dbaf3a1f62b68251189e9acdbd9affcbd98c5 /drivers/net/fm/ls1046.c | |
| parent | 239fe55a6ce516f329687c0680428ca2acfc73ca (diff) | |
| parent | 0154e6de37e8bbaac837939391f6d4a8f0b3fd18 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net
- DM9000 DM support
- tftp server bug fix
- mdio ofnode support functions
- Various phy fixes and improvements.
[trini: Fixup merge conflicts in drivers/net/phy/ethernet_id.c
drivers/net/phy/phy.c include/phy.h]
Diffstat (limited to 'drivers/net/fm/ls1046.c')
| -rw-r--r-- | drivers/net/fm/ls1046.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/fm/ls1046.c b/drivers/net/fm/ls1046.c index 09df0aa5376..876f48b1477 100644 --- a/drivers/net/fm/ls1046.c +++ b/drivers/net/fm/ls1046.c @@ -54,19 +54,19 @@ phy_interface_t fman_port_enet_if(enum fm_port port) u32 rcwsr13 = in_be32(&gur->rcwsr[13]); if (is_device_disabled(port)) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC1) && (is_serdes_configured(XFI_FM1_MAC9))) return PHY_INTERFACE_MODE_XGMII; if ((port == FM1_DTSEC9) && (is_serdes_configured(XFI_FM1_MAC9))) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if ((port == FM1_10GEC2) && (is_serdes_configured(XFI_FM1_MAC10))) return PHY_INTERFACE_MODE_XGMII; if ((port == FM1_DTSEC10) && (is_serdes_configured(XFI_FM1_MAC10))) - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; if (port == FM1_DTSEC3) if ((rcwsr13 & FSL_CHASSIS2_RCWSR13_EC1) == @@ -118,5 +118,5 @@ phy_interface_t fman_port_enet_if(enum fm_port port) break; } - return PHY_INTERFACE_MODE_NONE; + return PHY_INTERFACE_MODE_NA; } |