From 03f304937ba0bfe143d0d4b769146a7063361f1a Mon Sep 17 00:00:00 2001
From: Kapil Juneja <Kapil.Juneja@freescale.com>
Date: Fri, 11 May 2007 18:25:18 -0500
Subject: [PATCH] --- yaml --- r: 58355 b: refs/heads/master c:
 4117b5be4b877cec7c34058f0c239fcf78274e3d h: refs/heads/master i:   58353:
 99ea0669271667bfcf15cd0471d3badfa3937059   58351:
 21c818f7b4ea36a9ad287727822ce15f0255ceee v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/phy/marvell.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 23d4174f7cc8..3e9e4262c4ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3c12873c36005263286cf5660663c8c10f9d2b5
+refs/heads/master: 4117b5be4b877cec7c34058f0c239fcf78274e3d
diff --git a/trunk/drivers/net/phy/marvell.c b/trunk/drivers/net/phy/marvell.c
index b87f8d2a888b..fbe1104e9a07 100644
--- a/trunk/drivers/net/phy/marvell.c
+++ b/trunk/drivers/net/phy/marvell.c
@@ -60,6 +60,7 @@
 #define MII_M1111_PHY_EXT_SR		0x1b
 #define MII_M1111_HWCFG_MODE_MASK	0xf
 #define MII_M1111_HWCFG_MODE_RGMII	0xb
+#define MII_M1111_HWCFG_MODE_SGMII_NO_CLK	0x4
 
 MODULE_DESCRIPTION("Marvell PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -169,6 +170,21 @@ static int m88e1111_config_init(struct phy_device *phydev)
 			return err;
 	}
 
+	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
+		int temp;
+
+		temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+		if (temp < 0)
+			return temp;
+
+		temp &= ~(MII_M1111_HWCFG_MODE_MASK);
+		temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK;
+
+		err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+		if (err < 0)
+			return err;
+	}
+
 	err = phy_write(phydev, MII_BMCR, BMCR_RESET);
 	if (err < 0)
 		return err;