net: stmmac: Fix case when PHY handle is not present

[linux-2.6-microblaze.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_main.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8f5ebd5..91f24b6 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -953,9 +953,13 @@ static int stmmac_init_phy(struct net_device *dev)
 
        node = priv->plat->phylink_node;
 
-       if (node) {
+       if (node)
                ret = phylink_of_phy_connect(priv->phylink, node, 0);
-       } else {
+
+       /* Some DT bindings do not set-up the PHY handle. Let's try to
+        * manually parse it
+        */
+       if (!node || ret) {
                int addr = priv->plat->phy_addr;
                struct phy_device *phydev;