diff options
author | Kapil Juneja <Kapil.Juneja@freescale.com> | 2007-05-11 19:25:18 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-08 22:16:38 -0400 |
commit | 4117b5be4b877cec7c34058f0c239fcf78274e3d (patch) | |
tree | cd6af1d2edf385af102d654ac13ef4dcc3af6332 /drivers/net/phy | |
parent | d3c12873c36005263286cf5660663c8c10f9d2b5 (diff) |
phylib: m88e1111: enable SGMII mode
If connected via SGMII, initialize with SGMII mode configured.
Signed-off-by: Kapil Juneja <Kapil.Juneja@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r-- | drivers/net/phy/marvell.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b87f8d2a888b..fbe1104e9a07 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #define MII_M1111_PHY_EXT_SR 0x1b | 60 | #define MII_M1111_PHY_EXT_SR 0x1b |
61 | #define MII_M1111_HWCFG_MODE_MASK 0xf | 61 | #define MII_M1111_HWCFG_MODE_MASK 0xf |
62 | #define MII_M1111_HWCFG_MODE_RGMII 0xb | 62 | #define MII_M1111_HWCFG_MODE_RGMII 0xb |
63 | #define MII_M1111_HWCFG_MODE_SGMII_NO_CLK 0x4 | ||
63 | 64 | ||
64 | MODULE_DESCRIPTION("Marvell PHY driver"); | 65 | MODULE_DESCRIPTION("Marvell PHY driver"); |
65 | MODULE_AUTHOR("Andy Fleming"); | 66 | MODULE_AUTHOR("Andy Fleming"); |
@@ -169,6 +170,21 @@ static int m88e1111_config_init(struct phy_device *phydev) | |||
169 | return err; | 170 | return err; |
170 | } | 171 | } |
171 | 172 | ||
173 | if (phydev->interface == PHY_INTERFACE_MODE_SGMII) { | ||
174 | int temp; | ||
175 | |||
176 | temp = phy_read(phydev, MII_M1111_PHY_EXT_SR); | ||
177 | if (temp < 0) | ||
178 | return temp; | ||
179 | |||
180 | temp &= ~(MII_M1111_HWCFG_MODE_MASK); | ||
181 | temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK; | ||
182 | |||
183 | err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp); | ||
184 | if (err < 0) | ||
185 | return err; | ||
186 | } | ||
187 | |||
172 | err = phy_write(phydev, MII_BMCR, BMCR_RESET); | 188 | err = phy_write(phydev, MII_BMCR, BMCR_RESET); |
173 | if (err < 0) | 189 | if (err < 0) |
174 | return err; | 190 | return err; |