[PATCH net-next 7/7] net: phy: marvell10g: add support for the 88x2110 PHY

[Maxime Chevallier]

This patch adds support for the 88x2110 PHY, which is similar to the
already supported 88x3310 PHY without the SFP interface.

It supports 10/100/1000BASET along with 2.5GBASET, 5GBASET and 10GBASET,
with the same interface modes that are used by the 3310.

This PHY don't have the same issue as the 88x3310 regarding 2.5/5G
abilities, and correctly follows the 802.3bz standard to list the
supported abilities.

Signed-off-by: Maxime Chevallier <maxime.chevall...@bootlin.com>
Suggested-by: Antoine Tenart <antoine.ten...@bootlin.com>
---
 drivers/net/phy/marvell10g.c | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 0a35bf0fac47..106491ecc016 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -290,6 +290,30 @@ static int mv3310_config_init(struct phy_device *phydev)
        return 0;
 }
 
+static int mv2110_config_init(struct phy_device *phydev)
+{
+       int ret;
+
+       /* 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_XAUI &&
+           phydev->interface != PHY_INTERFACE_MODE_RXAUI &&
+           phydev->interface != PHY_INTERFACE_MODE_10GKR)
+               return -ENODEV;
+
+       ret = genphy_c45_read_abilities(phydev);
+       if (ret)
+               return ret;
+
+       /* Make sure we advertise all the supported modes, and not just the
+        * default one specified in the driver's .features.
+        */
+       linkmode_copy(phydev->advertising, phydev->supported);
+
+       return 0;
+}
+
 static int mv3310_config_aneg(struct phy_device *phydev)
 {
        bool changed = false;
@@ -504,12 +528,25 @@ static struct phy_driver mv3310_drivers[] = {
                .aneg_done      = mv3310_aneg_done,
                .read_status    = mv3310_read_status,
        },
+       {
+               .phy_id         = 0x002b09b8,
+               .phy_id_mask    = MARVELL_PHY_ID_MASK,
+               .name           = "mv88x2110",
+               .features       = PHY_10GBIT_FEATURES,
+               .probe          = mv3310_probe,
+               .soft_reset     = gen10g_no_soft_reset,
+               .config_init    = mv2110_config_init,
+               .config_aneg    = mv3310_config_aneg,
+               .aneg_done      = mv3310_aneg_done,
+               .read_status    = mv3310_read_status,
+       },
 };
 
 module_phy_driver(mv3310_drivers);
 
 static struct mdio_device_id __maybe_unused mv3310_tbl[] = {
        { 0x002b09aa, MARVELL_PHY_ID_MASK },
+       { 0x002b09b8, MARVELL_PHY_ID_MASK },
        { },
 };
 MODULE_DEVICE_TABLE(mdio, mv3310_tbl);
-- 
2.19.2