Commit db8857bf authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

stmmac: use an unique MDIO bus name.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09ef0789
...@@ -307,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev) ...@@ -307,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev)
priv->speed = 0; priv->speed = 0;
priv->oldduplex = -1; priv->oldduplex = -1;
snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->plat->bus_id); snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv->plat->bus_id);
snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id, snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
priv->plat->phy_addr); priv->plat->phy_addr);
pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id); pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id);
......
...@@ -158,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev) ...@@ -158,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev)
new_bus->read = &stmmac_mdio_read; new_bus->read = &stmmac_mdio_read;
new_bus->write = &stmmac_mdio_write; new_bus->write = &stmmac_mdio_write;
new_bus->reset = &stmmac_mdio_reset; new_bus->reset = &stmmac_mdio_reset;
snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", mdio_bus_data->bus_id); snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",
new_bus->name, mdio_bus_data->bus_id);
new_bus->priv = ndev; new_bus->priv = ndev;
new_bus->irq = irqlist; new_bus->irq = irqlist;
new_bus->phy_mask = mdio_bus_data->phy_mask; new_bus->phy_mask = mdio_bus_data->phy_mask;
......
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