From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Jian Subject: [PATCH 2/2] Fix 88e1111 copper/fiber selection in RGMII mode Date: Fri, 11 Jul 2008 08:55:31 +0800 Message-ID: <4876AF83.7030206@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]:50122 "EHLO mx.linux.net.cn" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755853AbYGKBaE (ORCPT ); Thu, 10 Jul 2008 21:30:04 -0400 Sender: netdev-owner@vger.kernel.org List-ID: MII_M1111_HWCFG_FIBER_COPPER_RES is a bit of MII_M1111_PHY_EXT_SR, not MII_M1111_PHY_EXT_CR. Signed-off-by: Wang Jian --- drivers/net/phy/marvell.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 737512c..4aa5479 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -158,7 +158,6 @@ static int m88e1111_config_init(struct phy_device *phydev) { int err; int temp; - int mode; /* Enable Fiber/Copper auto selection */ temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); @@ -198,9 +197,7 @@ static int m88e1111_config_init(struct phy_device *phydev) temp &= ~(MII_M1111_HWCFG_MODE_MASK); - mode = phy_read(phydev, MII_M1111_PHY_EXT_CR); - - if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES) + if (temp & MII_M1111_HWCFG_FIBER_COPPER_RES) temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII; else temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII; -- 1.5.5.4