projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
drivers
/
net
/
phy
/
dp83867.c
diff --git
a/drivers/net/phy/dp83867.c
b/drivers/net/phy/dp83867.c
index
9bd9a5c
..
6bbc81a
100644
(file)
--- a/
drivers/net/phy/dp83867.c
+++ b/
drivers/net/phy/dp83867.c
@@
-826,16
+826,12
@@
static int dp83867_phy_reset(struct phy_device *phydev)
{
int err;
{
int err;
- err = phy_write(phydev, DP83867_CTRL, DP83867_SW_RES
E
T);
+ err = phy_write(phydev, DP83867_CTRL, DP83867_SW_RES
TAR
T);
if (err < 0)
return err;
usleep_range(10, 20);
if (err < 0)
return err;
usleep_range(10, 20);
- /* After reset FORCE_LINK_GOOD bit is set. Although the
- * default value should be unset. Disable FORCE_LINK_GOOD
- * for the phy to work properly.
- */
return phy_modify(phydev, MII_DP83867_PHYCTRL,
DP83867_PHYCR_FORCE_LINK_GOOD, 0);
}
return phy_modify(phydev, MII_DP83867_PHYCTRL,
DP83867_PHYCR_FORCE_LINK_GOOD, 0);
}