net: phy: nxp-c45-tja11xx: add support for TJA1121

Add support for TJA1121 which is based on TJA1120 but with
additional MACsec IP.

Signed-off-by: Andrei Botila <andrei.botila@oss.nxp.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20250228154320.2979000-3-andrei.botila@oss.nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 41c15a2c20379d7dc25bf13be59407950facd6c4..d29f9f7fd2e110415496f322b2936c903cbc4d9c 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -328,7 +328,7 @@ config NXP_C45_TJA11XX_PHY
        depends on MACSEC || !MACSEC
        help
          Enable support for NXP C45 TJA11XX PHYs.
-         Currently supports the TJA1103, TJA1104 and TJA1120 PHYs.
+         Currently supports the TJA1103, TJA1104, TJA1120 and TJA1121 PHYs.
 
 config NXP_TJA11XX_PHY
        tristate "NXP TJA11xx PHYs support"

diff --git a/drivers/net/phy/nxp-c45-tja11xx.c b/drivers/net/phy/nxp-c45-tja11xx.c
index 4013a17c205adc03d544b8cec0c52f22cc3e3570..63945fe58227e1fd34dda44d8dc84c3d7a620682 100644 (file)
--- a/drivers/net/phy/nxp-c45-tja11xx.c
+++ b/drivers/net/phy/nxp-c45-tja11xx.c
@@ -22,6 +22,7 @@
 #define PHY_ID_MASK                    GENMASK(31, 4)
 /* Same id: TJA1103, TJA1104 */
 #define PHY_ID_TJA_1103                        0x001BB010
+/* Same id: TJA1120, TJA1121 */
 #define PHY_ID_TJA_1120                        0x001BB031
 
 #define VEND1_DEVICE_CONTROL           0x0040
@@ -1914,6 +1915,18 @@ static int tja1104_match_phy_device(struct phy_device *phydev)
               nxp_c45_macsec_ability(phydev);
 }
 
+static int tja1120_match_phy_device(struct phy_device *phydev)
+{
+       return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) &&
+              !nxp_c45_macsec_ability(phydev);
+}
+
+static int tja1121_match_phy_device(struct phy_device *phydev)
+{
+       return phy_id_compare(phydev->phy_id, PHY_ID_TJA_1120, PHY_ID_MASK) &&
+              nxp_c45_macsec_ability(phydev);
+}
+
 static const struct nxp_c45_regmap tja1120_regmap = {
        .vend1_ptp_clk_period   = 0x1020,
        .vend1_event_msg_filt   = 0x9010,
@@ -2032,7 +2045,6 @@ static struct phy_driver nxp_c45_driver[] = {
                .match_phy_device       = tja1104_match_phy_device,
        },
        {
-               PHY_ID_MATCH_MODEL(PHY_ID_TJA_1120),
                .name                   = "NXP C45 TJA1120",
                .get_features           = nxp_c45_get_features,
                .driver_data            = &tja1120_phy_data,
@@ -2055,6 +2067,32 @@ static struct phy_driver nxp_c45_driver[] = {
                .get_sqi                = nxp_c45_get_sqi,
                .get_sqi_max            = nxp_c45_get_sqi_max,
                .remove                 = nxp_c45_remove,
+               .match_phy_device       = tja1120_match_phy_device,
+       },
+       {
+               .name                   = "NXP C45 TJA1121",
+               .get_features           = nxp_c45_get_features,
+               .driver_data            = &tja1120_phy_data,
+               .probe                  = nxp_c45_probe,
+               .soft_reset             = nxp_c45_soft_reset,
+               .config_aneg            = genphy_c45_config_aneg,
+               .config_init            = nxp_c45_config_init,
+               .config_intr            = tja1120_config_intr,
+               .handle_interrupt       = nxp_c45_handle_interrupt,
+               .read_status            = genphy_c45_read_status,
+               .link_change_notify     = tja1120_link_change_notify,
+               .suspend                = genphy_c45_pma_suspend,
+               .resume                 = genphy_c45_pma_resume,
+               .get_sset_count         = nxp_c45_get_sset_count,
+               .get_strings            = nxp_c45_get_strings,
+               .get_stats              = nxp_c45_get_stats,
+               .cable_test_start       = nxp_c45_cable_test_start,
+               .cable_test_get_status  = nxp_c45_cable_test_get_status,
+               .set_loopback           = genphy_c45_loopback,
+               .get_sqi                = nxp_c45_get_sqi,
+               .get_sqi_max            = nxp_c45_get_sqi_max,
+               .remove                 = nxp_c45_remove,
+               .match_phy_device       = tja1121_match_phy_device,
        },
 };