From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Jian Subject: [PATCH 1/2] Fix copper/fiber auto-selection for 88e1111 Date: Fri, 11 Jul 2008 08:55:25 +0800 Message-ID: <4876AF7D.2090402@linux.net.cn> Mime-Version: 1.0 Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Cc: Alexandr Smirnov , Andy Fleming To: netdev@vger.kernel.org Return-path: Received: from [210.82.31.146] ([210.82.31.146]:50123 "EHLO mx.linux.net.cn" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756065AbYGKBaE (ORCPT ); Thu, 10 Jul 2008 21:30:04 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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 --- 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 32a8503..737512c 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); -- 1.5.5.4