aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-09 18:59:15 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-10 19:35:00 -0500
commit12322431d154250db9e61b0c79151c968a8d7766 (patch)
treeb19ecb9b785c2f5c5d9e131002a8c437c4daef79 /drivers/net/ethernet/marvell
parentd1b86507d87c94a201a9a1bb31d2285b189d8e26 (diff)
mv643xx-eth: use an unique MDIO bus name.
Signed-off-by: Florian Fainelli <florian@openwrt.org> Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 80aab4e5d695..9c049d2cb97d 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2613,7 +2613,8 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
2613 msp->smi_bus->name = "mv643xx_eth smi"; 2613 msp->smi_bus->name = "mv643xx_eth smi";
2614 msp->smi_bus->read = smi_bus_read; 2614 msp->smi_bus->read = smi_bus_read;
2615 msp->smi_bus->write = smi_bus_write, 2615 msp->smi_bus->write = smi_bus_write,
2616 snprintf(msp->smi_bus->id, MII_BUS_ID_SIZE, "%d", pdev->id); 2616 snprintf(msp->smi_bus->id, MII_BUS_ID_SIZE, "%s-%d",
2617 pdev->name, pdev->id);
2617 msp->smi_bus->parent = &pdev->dev; 2618 msp->smi_bus->parent = &pdev->dev;
2618 msp->smi_bus->phy_mask = 0xffffffff; 2619 msp->smi_bus->phy_mask = 0xffffffff;
2619 if (mdiobus_register(msp->smi_bus) < 0) 2620 if (mdiobus_register(msp->smi_bus) < 0)