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/tsec.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/tsec.c')
| -rw-r--r-- | drivers/net/tsec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index beca886b256..d69a9ff4773 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -834,7 +834,6 @@ int tsec_probe(struct udevice *dev) struct ofnode_phandle_args phandle_args; u32 tbiaddr = CONFIG_SYS_TBIPA_VALUE; struct tsec_data *data; - const char *phy_mode; ofnode parent, child; fdt_addr_t reg; u32 max_speed; @@ -894,12 +893,8 @@ int tsec_probe(struct udevice *dev) priv->tbiaddr = tbiaddr; - phy_mode = dev_read_prop(dev, "phy-connection-type", NULL); - if (!phy_mode) - phy_mode = dev_read_prop(dev, "phy-mode", NULL); - if (phy_mode) - pdata->phy_interface = phy_get_interface_by_name(phy_mode); - if (pdata->phy_interface == -1) + pdata->phy_interface = dev_read_phy_mode(dev); + if (pdata->phy_interface == PHY_INTERFACE_MODE_NA) pdata->phy_interface = tsec_get_interface(priv); priv->interface = pdata->phy_interface; |