From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, pgynther@google.com, opendmb@gmail.com,
jaedon.shin@gmail.com, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net 3/4] net: phy: bcm7xxx: Fix bcm7xxx_config_init() check
Date: Wed, 3 Feb 2016 13:13:48 -0800 [thread overview]
Message-ID: <1454534029-585-4-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1454534029-585-1-git-send-email-f.fainelli@gmail.com>
Since we were wrongly advertising gigabit features for these 10/100 only
Ethernet PHYs, bcm7xxx_config_init() which is supposed to apply workaround
would have not run since the check would be true, now that we have fixed the
PHY features, remove that check since it has no reasoning to be there anymore.
Fixes: e18556ee3bd83 ("net: phy: bcm7xxx: do not use PHY_BRCM_100MBPS_WAR")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/phy/bcm7xxx.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c
index 524806dd0f6b..568768abe3ed 100644
--- a/drivers/net/phy/bcm7xxx.c
+++ b/drivers/net/phy/bcm7xxx.c
@@ -250,10 +250,6 @@ static int bcm7xxx_config_init(struct phy_device *phydev)
phy_write(phydev, MII_BCM7XXX_AUX_MODE, MII_BCM7XX_64CLK_MDIO);
phy_read(phydev, MII_BCM7XXX_AUX_MODE);
- /* Workaround only required for 100Mbits/sec capable PHYs */
- if (phydev->supported & PHY_GBIT_FEATURES)
- return 0;
-
/* set shadow mode 2 */
ret = phy_set_clr_bits(phydev, MII_BCM7XXX_TEST,
MII_BCM7XXX_SHD_MODE_2, MII_BCM7XXX_SHD_MODE_2);
--
2.1.0
next prev parent reply other threads:[~2016-02-03 21:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-03 21:13 [PATCH net 0/4] net: phy: bcm7xxx 40nm PHY fixes Florian Fainelli
2016-02-03 21:13 ` [PATCH net 1/4] net: phy: bcm7xxx: Fix shadow mode 2 disabling Florian Fainelli
2016-02-03 21:13 ` [PATCH net 2/4] net: phy: bcm7xxx: Fix 40nm EPHY features Florian Fainelli
2016-02-03 21:13 ` Florian Fainelli [this message]
2016-02-03 21:13 ` [PATCH net 4/4] net: phy: bcm7xxx: Make MII_BCM7XX_64CLK_MDIO naming consistent Florian Fainelli
2016-02-06 1:25 ` [PATCH net 0/4] net: phy: bcm7xxx 40nm PHY fixes Florian Fainelli
2016-02-06 7:43 ` David Miller
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=1454534029-585-4-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=jaedon.shin@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=pgynther@google.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).