From patchwork Tue Jun 2 14:04:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haiying Wang X-Patchwork-Id: 27999 X-Patchwork-Delegate: galak@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D14FCB6F56 for ; Wed, 3 Jun 2009 00:05:29 +1000 (EST) Received: by ozlabs.org (Postfix) id 40EF5DE599; Wed, 3 Jun 2009 00:04:13 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 3F6CADE598 for ; Wed, 3 Jun 2009 00:04:13 +1000 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from az33egw02.freescale.net (az33egw02.freescale.net [192.88.158.103]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "az33egw02.freescale.net", Issuer "Thawte Premium Server CA" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 7CC02DDFE1 for ; Wed, 3 Jun 2009 00:03:46 +1000 (EST) Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/az33egw02) with ESMTP id n52E3emM029339; Tue, 2 Jun 2009 07:03:40 -0700 (MST) Received: from r54964-12.am.freescale.net (R54964-12.am.freescale.net [10.29.201.229]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id n52E3bla014046; Tue, 2 Jun 2009 09:03:40 -0500 (CDT) Received: from r54964-12.am.freescale.net (localhost.localdomain [127.0.0.1]) by r54964-12.am.freescale.net (8.13.8/8.13.8) with ESMTP id n52E4IHS004714; Tue, 2 Jun 2009 10:04:18 -0400 Received: (from why@localhost) by r54964-12.am.freescale.net (8.13.8/8.13.8/Submit) id n52E4HEd004713; Tue, 2 Jun 2009 10:04:17 -0400 From: Haiying Wang To: davem@davemloft.net, galak@kernel.crashing.org Subject: [PATCH 1/4] net/phy/marvell: update m88e1111 support for SGMII mode Date: Tue, 2 Jun 2009 10:04:13 -0400 Message-Id: <1243951456-4685-1-git-send-email-Haiying.Wang@freescale.com> X-Mailer: git-send-email 1.6.0.2 X-Brightmail-Tracker: AAAAAQAAAWE= Cc: linuxppc-dev@ozlabs.org, Haiying Wang , netdev@vger.kernel.org X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Disable fiber/copper auto selection for Marvell m88e1111 SGMII support. Signed-off-by: Haiying Wang --- drivers/net/phy/marvell.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 7a3ec9d..dd6f54d 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -243,6 +243,7 @@ static int m88e1111_config_init(struct phy_device *phydev) temp &= ~(MII_M1111_HWCFG_MODE_MASK); temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK; + temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO; err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); if (err < 0)