* [PATCH 1/1] phy/marvell: remove fiber/copper autoselect on 88e1111
@ 2013-01-17 15:36 Stef van Os
2013-01-17 20:47 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Stef van Os @ 2013-01-17 15:36 UTC (permalink / raw)
To: chohnstaedt, davem, srinivas.kandagatla; +Cc: netdev, linux-kernel, Stef van Os
Remove the code that always enables copper/fiber autoselect,
ignoring the DIS_FC strapping pin. The default value for this
register is autoselect on anyway, and if you explicitly disable
autoselect via strapping you probably really don't want
autoselect.
Signed-off-by: Stef van Os <stef.van.os@prodrive.nl>
---
drivers/net/phy/marvell.c | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 5d2a3f2..22dec9c 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -353,15 +353,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
int err;
int temp;
- /* Enable Fiber/Copper auto selection */
- temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
- temp &= ~MII_M1111_HWCFG_FIBER_COPPER_AUTO;
- phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
-
- temp = phy_read(phydev, MII_BMCR);
- temp |= BMCR_RESET;
- phy_write(phydev, MII_BMCR, temp);
-
if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
(phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
(phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/1] phy/marvell: remove fiber/copper autoselect on 88e1111
2013-01-17 15:36 [PATCH 1/1] phy/marvell: remove fiber/copper autoselect on 88e1111 Stef van Os
@ 2013-01-17 20:47 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-01-17 20:47 UTC (permalink / raw)
To: stef.van.os; +Cc: chohnstaedt, srinivas.kandagatla, netdev, linux-kernel
From: Stef van Os <stef.van.os@prodrive.nl>
Date: Thu, 17 Jan 2013 16:36:18 +0100
> Remove the code that always enables copper/fiber autoselect,
> ignoring the DIS_FC strapping pin. The default value for this
> register is autoselect on anyway, and if you explicitly disable
> autoselect via strapping you probably really don't want
> autoselect.
>
> Signed-off-by: Stef van Os <stef.van.os@prodrive.nl>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-17 20:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-17 15:36 [PATCH 1/1] phy/marvell: remove fiber/copper autoselect on 88e1111 Stef van Os
2013-01-17 20:47 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).