projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-samsung
[platform/kernel/u-boot.git]
/
drivers
/
net
/
phy
/
marvell.c
diff --git
a/drivers/net/phy/marvell.c
b/drivers/net/phy/marvell.c
index
8041922
..
b7f300e
100644
(file)
--- a/
drivers/net/phy/marvell.c
+++ b/
drivers/net/phy/marvell.c
@@
-482,7
+482,10
@@
static int m88e1145_config(struct phy_device *phydev)
genphy_config_aneg(phydev);
- phy_reset(phydev);
+ /* soft reset */
+ reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);
+ reg |= BMCR_RESET;
+ phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, reg);
return 0;
}