Re: [PATCH 1/1] net: stmmac: Don't search for phys if mdio node is defined.
From: Giuseppe CAVALLARO <hidden>
Date: 2016-03-16 09:36:37
On 3/15/2016 8:34 AM, Phil Reid wrote:
If a dt mdio entry has been added least assume that we wont search for phys attached. The DT and of_mdiobus_register already do this. This stops DSA phys being found and phys created for them, as this is handled by the DSA driver.
iiuc, this doesn't conflict with the recent rework we are doing for the mdio/phy platform management.
Signed-off-by: Phil Reid <redacted>
Acked-by: Giuseppe Cavallaro <redacted>
quoted hunk ↗ jump to hunk
--- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 ++++ 1 file changed, 4 insertions(+)diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index 3f5512f..06704ca 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c@@ -235,6 +235,9 @@ int stmmac_mdio_register(struct net_device *ndev) goto bus_register_fail; } + if (priv->plat->phy_node || mdio_node) + goto bus_register_done; + found = 0; for (addr = 0; addr < PHY_MAX_ADDR; addr++) { struct phy_device *phydev = mdiobus_get_phy(new_bus, addr);@@ -290,6 +293,7 @@ int stmmac_mdio_register(struct net_device *ndev) return -ENODEV; } +bus_register_done: priv->mii = new_bus; return 0;