From: Florian Fainelli <f.fainelli@gmail.com>
To: <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, <sebastian.hesselbarth@gmail.com>,
<sergei.shtylyov@cogentembedded.com>, <afleming@gmail.com>,
<kyle@moffetthome.net>, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH 8/9] net: tc35815: use phy_init_hw for PHY reset
Date: Thu, 5 Dec 2013 16:55:16 -0800 [thread overview]
Message-ID: <1386291317-1202-9-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1386291317-1202-1-git-send-email-f.fainelli@gmail.com>
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>
---
drivers/net/ethernet/toshiba/tc35815.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 1322546..f6b3212 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -1170,19 +1170,12 @@ static int tc35815_tx_full(struct net_device *dev)
static void tc35815_restart(struct net_device *dev)
{
struct tc35815_local *lp = netdev_priv(dev);
+ int ret;
if (lp->phy_dev) {
- int timeout;
-
- phy_write(lp->phy_dev, MII_BMCR, BMCR_RESET);
- 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);
+ ret = phy_init_hw(lp->phy_dev);
+ if (ret)
+ printk(KERN_ERR "%s: PHY init failed.\n", dev->name);
}
spin_lock_bh(&lp->rx_lock);
--
1.8.3.2
next prev parent reply other threads:[~2013-12-06 1:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-06 0:55 [PATCH 0/9] net: phy: PHY reset consolidation Florian Fainelli
2013-12-06 0:55 ` [PATCH 1/9] net: phy: report link partner features through ethtool Florian Fainelli
2013-12-06 0:55 ` [PATCH 2/9] net: phy: use phy_init_hw instead of open-coding it Florian Fainelli
2013-12-06 0:55 ` [PATCH 3/9] net: greth: use phy_read_status() Florian Fainelli
2013-12-06 0:55 ` [PATCH 4/9] net: bfin_mac: do not reset PHY after phy_start() Florian Fainelli
2013-12-06 0:55 ` [PATCH 5/9] net: phy: consolidate PHY reset in phy_init_hw() Florian Fainelli
2013-12-06 0:55 ` [PATCH 6/9] net: mv643xx_eth: use phy_init_hw to reset PHY Florian Fainelli
2013-12-06 2:16 ` Sergei Shtylyov
2013-12-06 0:55 ` [PATCH 7/9] net: pxa168_eth: use phy_init_hw for PHY reset Florian Fainelli
2013-12-06 1:06 ` Florian Fainelli
2013-12-06 0:55 ` Florian Fainelli [this message]
2013-12-06 0:55 ` [PATCH 9/9] net: sh_eth: do not issue a wild PHY reset through BMCR Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386291317-1202-9-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=afleming@gmail.com \
--cc=davem@davemloft.net \
--cc=kyle@moffetthome.net \
--cc=netdev@vger.kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=sergei.shtylyov@cogentembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).