diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-29 15:23:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-29 15:23:49 -0700 |
| commit | c3aad35e4890d79084ab70c54a5d7740045d2f90 (patch) | |
| tree | 00ef5d250678eca0ae539dca4a10d2d6de5334d9 /drivers/net/phy/mdio_bus.c | |
| parent | 6623b4194459c07859d3e3196c3994fa7be5b88e (diff) | |
| parent | 24f28dde5bed3b6322003dca903ebf7732efa550 (diff) | |
| download | linux-c3aad35e4890d79084ab70c54a5d7740045d2f90.tar.bz2 | |
Merge branch 'of_mdio'
Daniel Mack says:
====================
mdio: Parse DT nodes for auto-probed PHYs
Here's v2.
v1 -> v2:
* Switch to of_property_read_u32() in patch #1
* Check for mdio->dev_of_node in patch #2
* Added Florian's Reviewed-by: tags
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/mdio_bus.c')
| -rw-r--r-- | drivers/net/phy/mdio_bus.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index a6284964b711..2e58aa54484c 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -300,6 +300,12 @@ struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) if (IS_ERR(phydev) || phydev == NULL) return phydev; + /* + * For DT, see if the auto-probed phy has a correspoding child + * in the bus node, and set the of_node pointer in this case. + */ + of_mdiobus_link_phydev(bus, phydev); + err = phy_device_register(phydev); if (err) { phy_device_free(phydev); |