1 files changed, 16 insertions, 8 deletions

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index cfa37041ab71..c4bb8027b3fb 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -689,16 +689,24 @@ static int xgene_enet_phy_connect(struct net_device *ndev)
                         netdev_dbg(ndev, "No phy-handle found in DT\n");
                         return -ENODEV;
                 }
-                pdata->phy_dev = of_phy_find_device(phy_np);
-        }
 
-        phy_dev = pdata->phy_dev;
+                phy_dev = of_phy_connect(ndev, phy_np, &xgene_enet_adjust_link,
+                                         0, pdata->phy_mode);
+                if (!phy_dev) {
+                        netdev_err(ndev, "Could not connect to PHY\n");
+                        return -ENODEV;
+                }
+
+                pdata->phy_dev = phy_dev;
+        } else {
+                phy_dev = pdata->phy_dev;
 
-        if (!phy_dev ||
-            phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link,
-                               pdata->phy_mode)) {
-                netdev_err(ndev, "Could not connect to PHY\n");
-                return  -ENODEV;
+                if (!phy_dev ||
+                    phy_connect_direct(ndev, phy_dev, &xgene_enet_adjust_link,
+                                       pdata->phy_mode)) {
+                        netdev_err(ndev, "Could not connect to PHY\n");
+                        return  -ENODEV;
+                }
         }
 
         pdata->phy_speed = SPEED_UNKNOWN;