Commit e66bf63a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller

net: dsa: qca8k: skip MDIO bus creation if its OF node has status = "disabled"

Currently the driver calls the non-OF devm_mdiobus_register() rather
than devm_of_mdiobus_register() for this case, but it seems to rather
be a confusing coincidence, and not a real use case that needs to be
supported.

If the device tree says status = "disabled" for the MDIO bus, we
shouldn't need an MDIO bus at all. Instead, just exit as early as
possible and do not call any MDIO API.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 68e1010c
......@@ -949,9 +949,11 @@ qca8k_mdio_register(struct qca8k_priv *priv)
struct dsa_switch *ds = priv->ds;
struct device_node *mdio;
struct mii_bus *bus;
int err;
int err = 0;
mdio = of_get_child_by_name(priv->dev->of_node, "mdio");
if (mdio && !of_device_is_available(mdio))
goto out;
bus = devm_mdiobus_alloc(ds->dev);
if (!bus) {
......@@ -967,7 +969,7 @@ qca8k_mdio_register(struct qca8k_priv *priv)
ds->user_mii_bus = bus;
/* Check if the devicetree declare the port:phy mapping */
if (of_device_is_available(mdio)) {
if (mdio) {
bus->name = "qca8k user mii";
bus->read = qca8k_internal_mdio_read;
bus->write = qca8k_internal_mdio_write;
......@@ -986,7 +988,7 @@ qca8k_mdio_register(struct qca8k_priv *priv)
out_put_node:
of_node_put(mdio);
out:
return err;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment