diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2016-04-29 01:24:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-02 01:34:29 +0200 |
| commit | a77f4f70fd34ac7b67581fe5b89ddc1c9ac20d39 (patch) | |
| tree | d304258f6d37948848d165e4087292346fbe8211 | |
| parent | Merge branch 'mlx5-aRFS' (diff) | |
| download | linux-a77f4f70fd34ac7b67581fe5b89ddc1c9ac20d39.tar.xz linux-a77f4f70fd34ac7b67581fe5b89ddc1c9ac20d39.zip | |
of: of_mdio: Check if MDIO bus controller is available
Add a check whether the 'struct device_node' pointer passed to
of_mdiobus_register() is an available (aka enabled) node in the Device
Tree.
Rationale for doing this are cases where an Ethernet MAC provides a MDIO
bus controller and node, and an additional Ethernet MAC might be
connecting its PHY/switches to that first MDIO bus controller, while
still embedding one internally which is therefore marked as "disabled".
Instead of sprinkling checks like these in callers of
of_mdiobus_register(), do this in a central location.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/of/of_mdio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index b622b33dbf93..e051e1b57609 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c @@ -209,6 +209,10 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) bool scanphys = false; int addr, rc; + /* Do not continue if the node is disabled */ + if (!of_device_is_available(np)) + return -ENODEV; + /* Mask out all PHYs from auto probing. Instead the PHYs listed in * the device tree are populated after the bus has been registered */ mdio->phy_mask = ~0; |