diff options
| author |   Jose Abreu <Jose.Abreu@synopsys.com> | 2019-06-28 09:25:07 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-28 09:18:54 -0700 |
| commit | 42e87024f72708291e2b79d3365ba6a50827d0a4 (patch) | |
| tree | d27690b9aea607d2887762f9d473c72ad18dc019 /drivers/net/ethernet/stmicro | |
| parent | sis900: remove TxIDLE (diff) | |
| download | linux-dev-42e87024f72708291e2b79d3365ba6a50827d0a4.tar.xz linux-dev-42e87024f72708291e2b79d3365ba6a50827d0a4.zip | |
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: 74371272f97f ("net: stmmac: Convert to phylink and remove phylib logic")
Reported-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
Tested-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
Signed-off-by: Jose 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 8f5ebd51859e..91f24b63ea16 100644 --- 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; |