[PATCH net-next v2 03/12] net: phy: marvell10g: allow 5gbase-r and usxgmii

[Marek Behún]

This modes are also supported by this PHYs.

Signed-off-by: Marek Behún <ka...@kernel.org>
---
 drivers/net/phy/marvell10g.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index f2f0da9717be..881a0717846e 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -462,9 +462,11 @@ static int mv3310_config_init(struct phy_device *phydev)
        /* Check that the PHY interface type is compatible */
        if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
            phydev->interface != PHY_INTERFACE_MODE_2500BASEX &&
+           phydev->interface != PHY_INTERFACE_MODE_5GBASER &&
            phydev->interface != PHY_INTERFACE_MODE_XAUI &&
            phydev->interface != PHY_INTERFACE_MODE_RXAUI &&
-           phydev->interface != PHY_INTERFACE_MODE_10GBASER)
+           phydev->interface != PHY_INTERFACE_MODE_10GBASER &&
+           phydev->interface != PHY_INTERFACE_MODE_USXGMII)
                return -ENODEV;
 
        phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
@@ -599,6 +601,7 @@ static void mv3310_update_interface(struct phy_device 
*phydev)
 
        if ((phydev->interface == PHY_INTERFACE_MODE_SGMII ||
             phydev->interface == PHY_INTERFACE_MODE_2500BASEX ||
+            phydev->interface == PHY_INTERFACE_MODE_5GBASER ||
             phydev->interface == PHY_INTERFACE_MODE_10GBASER) &&
            phydev->link) {
                /* The PHY automatically switches its serdes interface (and
@@ -611,6 +614,9 @@ static void mv3310_update_interface(struct phy_device 
*phydev)
                case SPEED_10000:
                        phydev->interface = PHY_INTERFACE_MODE_10GBASER;
                        break;
+               case SPEED_5000:
+                       phydev->interface = PHY_INTERFACE_MODE_5GBASER;
+                       break;
                case SPEED_2500:
                        phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
                        break;
-- 
2.26.2