lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: tc35815: use phy_init_hw for PHY reset

Browse Source 
Instead of open-coding the PHY reset through MII BMCR, use phy_init_hw()
which does that for us and also makes sure that any PHY specific fixups
are applied.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli
2013-12-06 13:01:37 -08:00
committed by David S. Miller
parent 78de53f05c
commit 01b0114e06
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/toshiba/tc35815.c
View File

@@ -1170,19 +1170,12 @@ static int tc35815_tx_full(struct net_device *dev)
static void tc35815_restart(struct net_device *dev) static void tc35815_restart(struct net_device *dev)
{ {
struct tc35815_local *lp = netdev_priv(dev); struct tc35815_local *lp = netdev_priv(dev);
int ret;
if (lp->phy_dev) { if (lp->phy_dev) {
int timeout; ret = phy_init_hw(lp->phy_dev);
if (ret)
phy_write(lp->phy_dev, MII_BMCR, BMCR_RESET); printk(KERN_ERR "%s: PHY init failed.\n", dev->name);
timeout = 100;
while (--timeout) {
if (!(phy_read(lp->phy_dev, MII_BMCR) & BMCR_RESET))
break;
udelay(1);
}
if (!timeout)
printk(KERN_ERR "%s: BMCR reset failed.\n", dev->name);
} }
spin_lock_bh(&lp->rx_lock); spin_lock_bh(&lp->rx_lock);