diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-02-13 01:23:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-13 16:04:09 -0500 |
| commit | 7465ac3c2f2c99b3c69bd8e257758a0baa7bc7ea (patch) | |
| tree | ee33b1fe47858ee26da831aa87ff91abd5c50940 /drivers/net/ethernet | |
| parent | b0c06e12b6f1dad480c459ddc5412a0fd8582201 (diff) | |
| download | linux-stable-7465ac3c2f2c99b3c69bd8e257758a0baa7bc7ea.tar.gz linux-stable-7465ac3c2f2c99b3c69bd8e257758a0baa7bc7ea.tar.bz2 linux-stable-7465ac3c2f2c99b3c69bd8e257758a0baa7bc7ea.zip | |
ixp4xx-eth: fix PHY name to match MDIO bus name
Commit 0869b3a4: ixp4xx-eth: use an unique MDIO bus name changed
the MDIO bus name from "0" to "ixp4xx-eth-0", as a result the PHY
name is not longer appropriate and will not match the MDIO bus name
so PHY connection will not succeed, fix that.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index 72a854f05bb8..41a8b5a9849e 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1416,7 +1416,8 @@ static int __devinit eth_init_one(struct platform_device *pdev) __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); udelay(50); - snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy); + snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, + mdio_bus->id, plat->phy); port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0, PHY_INTERFACE_MODE_MII); if (IS_ERR(port->phydev)) { |