1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index a16dc3508998..fcd1e0b46103 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -848,6 +848,7 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
         int rc;
         struct resource res;
         struct device_node *np = of_get_parent(lp->phy_node);
+        struct device_node *npp;
 
         /* Don't register the MDIO bus if the phy_node or its parent node
          * can't be found.
@@ -856,6 +857,17 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
                 dev_err(dev, "Failed to register mdio bus.\n");
                 return -ENODEV;
         }
+        npp = of_get_parent(np);
+
+        of_address_to_resource(npp, 0, &res);
+        if (lp->ndev->mem_start != res.start) {
+                struct phy_device *phydev;
+                phydev = of_phy_find_device(lp->phy_node);
+                if (!phydev)
+                        dev_info(dev,
+                                 "MDIO of the phy is not registered yet\n");
+                return 0;
+        }
 
         /* Enable the MDIO bus by asserting the enable bit in MDIO Control
          * register.
@@ -869,7 +881,6 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
                 return -ENOMEM;
         }
 
-        of_address_to_resource(np, 0, &res);
         snprintf(bus->id, MII_BUS_ID_SIZE, "%.8llx",
                  (unsigned long long)res.start);
         bus->priv = lp;