diff options
| author | Codrin Ciubotariu <codrin.ciubotariu@microchip.com> | 2020-03-31 12:39:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-31 20:06:27 +0300 |
| commit | 79540d133ed6f65a37dacb54b7a704cc8a24c52d (patch) | |
| tree | 10240b8d539319d2aaf1efd79bfb1a4d19c3ae91 | |
| parent | f772148eb757b0823fbfdc2fe592d5e06c7f19b0 (diff) | |
| download | linux-79540d133ed6f65a37dacb54b7a704cc8a24c52d.tar.xz | |
net: macb: Fix handling of fixed-link node
fixed-link nodes are treated as PHY nodes by of_mdiobus_child_is_phy().
We must check if the interface is a fixed-link before looking up for PHY
nodes.
Fixes: 7897b071ac3b ("net: macb: convert to phylink")
Tested-by: Cristian Birsan <cristian.birsan@microchip.com>
Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 3a7c26b08607..a0e8c5bbabc0 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -737,6 +737,9 @@ static int macb_mdiobus_register(struct macb *bp) { struct device_node *child, *np = bp->pdev->dev.of_node; + if (of_phy_is_fixed_link(np)) + return mdiobus_register(bp->mii_bus); + /* Only create the PHY from the device tree if at least one PHY is * described. Otherwise scan the entire MDIO bus. We do this to support * old device tree that did not follow the best practices and did not |