diff options
author | Tom Rini <trini@konsulko.com> | 2023-05-08 14:31:04 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-05-08 14:31:04 -0400 |
commit | 11910550b65e6072b9542d462c0aa93f4ca81836 (patch) | |
tree | 8308c98ffad76d9693654a28090b03f270a7d250 /drivers/net/dwc_eth_qos.c | |
parent | 9876c8c147144db2c120fcc9ffa6de27f6894441 (diff) | |
parent | f1d33a44ca04fdca241c1d89fd79e2e56c930c7e (diff) |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/dwc_eth_qos.c')
-rw-r--r-- | drivers/net/dwc_eth_qos.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/net/dwc_eth_qos.c b/drivers/net/dwc_eth_qos.c index ec58697b311..9bbba6eed07 100644 --- a/drivers/net/dwc_eth_qos.c +++ b/drivers/net/dwc_eth_qos.c @@ -794,9 +794,21 @@ static int eqos_start(struct udevice *dev) */ if (!eqos->phy) { int addr = -1; - addr = eqos_get_phy_addr(eqos, dev); - eqos->phy = phy_connect(eqos->mii, addr, dev, - eqos->config->interface(dev)); + ofnode fixed_node; + + if (IS_ENABLED(CONFIG_PHY_FIXED)) { + fixed_node = ofnode_find_subnode(dev_ofnode(dev), + "fixed-link"); + if (ofnode_valid(fixed_node)) + eqos->phy = fixed_phy_create(dev_ofnode(dev)); + } + + if (!eqos->phy) { + addr = eqos_get_phy_addr(eqos, dev); + eqos->phy = phy_connect(eqos->mii, addr, dev, + eqos->config->interface(dev)); + } + if (!eqos->phy) { pr_err("phy_connect() failed"); goto err_stop_resets; |