Commit 42e87024 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller

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

Some DT bindings do not have the PHY handle. Let's fallback to manually
discovery in case phylink_of_phy_connect() fails.

Changes from v1:
	- Fixup comment style (Sergei)

Fixes: 74371272 ("net: stmmac: Convert to phylink and remove phylib logic")
Reported-by: default avatarKatsuhiro Suzuki <katsuhiro@katsuster.net>
Tested-by: default avatarKatsuhiro Suzuki <katsuhiro@katsuster.net>
Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee7dd773
...@@ -953,9 +953,13 @@ static int stmmac_init_phy(struct net_device *dev) ...@@ -953,9 +953,13 @@ static int stmmac_init_phy(struct net_device *dev)
node = priv->plat->phylink_node; node = priv->plat->phylink_node;
if (node) { if (node)
ret = phylink_of_phy_connect(priv->phylink, node, 0); 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; int addr = priv->plat->phy_addr;
struct phy_device *phydev; struct phy_device *phydev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment