diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
| commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
| tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /drivers/net/phy | |
| parent | 265592a1dfc31ecab02a960721a1f137e50afb17 (diff) | |
| parent | ba836a6f5ab1243ff5e08a941a2d1de8b31244e1 (diff) | |
| download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/phy/marvell.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index d361835b315d..8dbd59baa34d 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -279,6 +279,7 @@ config MARVELL_PHY config MESON_GXL_PHY tristate "Amlogic Meson GXL Internal PHY" + depends on ARCH_MESON || COMPILE_TEST ---help--- Currently has a driver for the Amlogic Meson GXL Internal PHY diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e269262471a4..0b78210c0fa7 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1192,7 +1192,8 @@ static int marvell_read_status(struct phy_device *phydev) int err; /* Check the fiber mode first */ - if (phydev->supported & SUPPORTED_FIBRE) { + if (phydev->supported & SUPPORTED_FIBRE && + phydev->interface != PHY_INTERFACE_MODE_SGMII) { err = phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_M1111_FIBER); if (err < 0) goto error; |