diff options
| author | Wang Jian <lark@linux.net.cn> | 2008-07-16 21:46:17 +0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-22 17:58:10 -0400 |
| commit | 9cf8fa4334e60f27b4a392f432c292f3af268215 (patch) | |
| tree | ef84f4c0ca3559518b085639340b8b392e6ffef2 /drivers/net/phy | |
| parent | c0e5a8c21bb9bb222917c36eba503ae88af52c34 (diff) | |
| download | linux-stable-9cf8fa4334e60f27b4a392f432c292f3af268215.tar.gz linux-stable-9cf8fa4334e60f27b4a392f432c292f3af268215.tar.bz2 linux-stable-9cf8fa4334e60f27b4a392f432c292f3af268215.zip | |
net/phy: Fix copper/fiber auto-selection for 88e1111
The 27.15 bit (MII_M1111_HWCFG_FIBER_COPPER_AUTO) is disable bit. When
set to 1, copper/fiber auto selection is disabled. The current code
to enable but actually disable auto selection.
Signed-off-by: Wang Jian <lark@linux.net.cn>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 32a8503a7acd..737512c00971 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -162,7 +162,7 @@ static int m88e1111_config_init(struct phy_device *phydev) /* Enable Fiber/Copper auto selection */ temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); - temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO; + temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO; phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); temp = phy_read(phydev, MII_BMCR); |