| Message ID | E1eOi7f-0002Rs-K7@rmk-PC.armlinux.org.uk |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | of_mdio / mdiobus: ensure mdio devices have fwnode correctly populated | expand |
On Tue, Dec 12, 2017 at 4:49 AM, Russell King <rmk+kernel@armlinux.org.uk> wrote: > Ensure that all mdio devices populate the struct device fwnode pointer > as well as the of_node pointer to allow drivers that wish to use > fwnode APIs to work. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > --- > drivers/net/phy/mdio_bus.c | 1 + > drivers/of/of_mdio.c | 3 +++ > 2 files changed, 4 insertions(+) Reviewed-by: Rob Herring <robh@kernel.org>
On Tue, Dec 12, 2017 at 10:49:15AM +0000, Russell King wrote: > Ensure that all mdio devices populate the struct device fwnode pointer > as well as the of_node pointer to allow drivers that wish to use > fwnode APIs to work. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Russell King <rmk+kernel@armlinux.org.uk> Date: Tue, 12 Dec 2017 10:49:15 +0000 > Ensure that all mdio devices populate the struct device fwnode pointer > as well as the of_node pointer to allow drivers that wish to use > fwnode APIs to work. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Applied.
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index d9a185ed0286..c3458b6de7ca 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -270,6 +270,7 @@ static void of_mdiobus_link_mdiodev(struct mii_bus *bus, if (addr == mdiodev->addr) { dev->of_node = child; + dev->fwnode = of_fwnode_handle(child); return; } } diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 98258583abb0..3481e69738b5 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -81,6 +81,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, * can be looked up later */ of_node_get(child); phy->mdio.dev.of_node = child; + phy->mdio.dev.fwnode = of_fwnode_handle(child); /* All data is now stored in the phy struct; * register it */ @@ -111,6 +112,7 @@ static int of_mdiobus_register_device(struct mii_bus *mdio, */ of_node_get(child); mdiodev->dev.of_node = child; + mdiodev->dev.fwnode = of_fwnode_handle(child); /* All data is now stored in the mdiodev struct; register it. */ rc = mdio_device_register(mdiodev); @@ -206,6 +208,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) mdio->phy_mask = ~0; mdio->dev.of_node = np; + mdio->dev.fwnode = of_fwnode_handle(np); /* Get bus level PHY reset GPIO details */ mdio->reset_delay_us = DEFAULT_GPIO_RESET_DELAY;
Ensure that all mdio devices populate the struct device fwnode pointer as well as the of_node pointer to allow drivers that wish to use fwnode APIs to work. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/mdio_bus.c | 1 + drivers/of/of_mdio.c | 3 +++ 2 files changed, 4 insertions(+)