diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-13 09:22:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-13 16:10:54 -0500 |
| commit | de9c4e06bbe872d725f306e34f3eea21155488e2 (patch) | |
| tree | f794bce1df2fb1a763146969967371af2ef16611 /drivers/net/phy/marvell.c | |
| parent | 53c64870d03edfa5c554ac2f750c5d6b38e3680a (diff) | |
| download | linux-de9c4e06bbe872d725f306e34f3eea21155488e2.tar.bz2 | |
net: phy: marvell: avoid configuring fiber page for SGMII-to-Copper
When in SGMII-to-Copper mode, the fiber page is used for the MAC facing
link, and does not require configuration of the fiber auto-negotiation
settings. Avoid trying.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 4d02b27df044..b5a8f750e433 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -637,6 +637,10 @@ static int m88e1510_config_aneg(struct phy_device *phydev) if (err < 0) goto error; + /* Do not touch the fiber page if we're in copper->sgmii mode */ + if (phydev->interface == PHY_INTERFACE_MODE_SGMII) + return 0; + /* Then the fiber link */ err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); if (err < 0) |