diff options
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index ee85a14853f5..96fa2da30763 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |||
@@ -307,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev) | |||
307 | priv->speed = 0; | 307 | priv->speed = 0; |
308 | priv->oldduplex = -1; | 308 | priv->oldduplex = -1; |
309 | 309 | ||
310 | snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->plat->bus_id); | 310 | snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv->plat->bus_id); |
311 | snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id, | 311 | snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id, |
312 | priv->plat->phy_addr); | 312 | priv->plat->phy_addr); |
313 | pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id); | 313 | pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id); |
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index 51f441233962..da4a1042523a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | |||
@@ -158,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev) | |||
158 | new_bus->read = &stmmac_mdio_read; | 158 | new_bus->read = &stmmac_mdio_read; |
159 | new_bus->write = &stmmac_mdio_write; | 159 | new_bus->write = &stmmac_mdio_write; |
160 | new_bus->reset = &stmmac_mdio_reset; | 160 | new_bus->reset = &stmmac_mdio_reset; |
161 | snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", mdio_bus_data->bus_id); | 161 | snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x", |
162 | new_bus->name, mdio_bus_data->bus_id); | ||
162 | new_bus->priv = ndev; | 163 | new_bus->priv = ndev; |
163 | new_bus->irq = irqlist; | 164 | new_bus->irq = irqlist; |
164 | new_bus->phy_mask = mdio_bus_data->phy_mask; | 165 | new_bus->phy_mask = mdio_bus_data->phy_mask; |