diff options
author | Tom Rini <trini@konsulko.com> | 2023-09-13 18:02:28 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-09-13 18:02:28 -0400 |
commit | 3cba5a115ff8b5aeca62e5ae7dfad6bacb32e9fd (patch) | |
tree | e44e6637e47d41e4f3926fa14c81785bc92ac76a /drivers/net/zynq_gem.c | |
parent | ce67ba1e30da583d03bf3cdd5b6ee75174c75f0a (diff) | |
parent | 565f556d0ba7f36def70dc36422d8730ff70f7a9 (diff) |
Merge branch '2023-09-13-phy-improvements' into next
- YT8511 and BCM54210E PHY support, cleanup and then use
generic_phy_valid more, and then further clean up
generic_{setup,shutdown}_phy()
Diffstat (limited to 'drivers/net/zynq_gem.c')
-rw-r--r-- | drivers/net/zynq_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index f3cdfb0275..3377e669f2 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -890,7 +890,8 @@ static int zynq_gem_probe(struct udevice *dev) if (ret) goto err3; - if (priv->interface == PHY_INTERFACE_MODE_SGMII && phy.dev) { + if (priv->interface == PHY_INTERFACE_MODE_SGMII && + generic_phy_valid(&phy)) { if (IS_ENABLED(CONFIG_DM_ETH_PHY)) { if (device_is_compatible(dev, "cdns,zynqmp-gem") || device_is_compatible(dev, "xlnx,zynqmp-gem")) { |