diff options
author | trem <tremyfr@yahoo.fr> | 2012-12-04 03:52:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 12:48:00 -0500 |
commit | 6ded7cd605502eff7341bbd912ebc90c3674c764 (patch) | |
tree | 70a120c195ffe3e61900de404b54b8a53756030e /drivers/net/phy | |
parent | 4bd9b0fffb193d2e288f67f81821af32df8d4349 (diff) |
net: phy: smsc: force all capable mode if the phy is started in powerdown mode
A SMSC PHY in power down mode can't be used.
If a SMSC PHY is in this mode in the config_init
stage, the mode "all capable" is set. So the PHY
could then be used.
Signed-off-by: Philippe Reynes <tremyfr@yahoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r-- | drivers/net/phy/smsc.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 16dceed29d8..ef883e3048c 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c | |||
@@ -43,7 +43,31 @@ static int smsc_phy_ack_interrupt(struct phy_device *phydev) | |||
43 | 43 | ||
44 | static int smsc_phy_config_init(struct phy_device *phydev) | 44 | static int smsc_phy_config_init(struct phy_device *phydev) |
45 | { | 45 | { |
46 | int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); | 46 | int rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES); |
47 | if (rc < 0) | ||
48 | return rc; | ||
49 | |||
50 | /* If the SMSC PHY is in power down mode, then set it | ||
51 | * in all capable mode before using it. | ||
52 | */ | ||
53 | if ((rc & MII_LAN83C185_MODE_MASK) == MII_LAN83C185_MODE_POWERDOWN) { | ||
54 | int timeout = 50000; | ||
55 | |||
56 | /* set "all capable" mode and reset the phy */ | ||
57 | rc |= MII_LAN83C185_MODE_ALL; | ||
58 | phy_write(phydev, MII_LAN83C185_SPECIAL_MODES, rc); | ||
59 | phy_write(phydev, MII_BMCR, BMCR_RESET); | ||
60 | |||
61 | /* wait end of reset (max 500 ms) */ | ||
62 | do { | ||
63 | udelay(10); | ||
64 | if (timeout-- == 0) | ||
65 | return -1; | ||
66 | rc = phy_read(phydev, MII_BMCR); | ||
67 | } while (rc & BMCR_RESET); | ||
68 | } | ||
69 | |||
70 | rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); | ||
47 | if (rc < 0) | 71 | if (rc < 0) |
48 | return rc; | 72 | return rc; |
49 | 73 | ||