1 files changed, 36 insertions, 4 deletions

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 2fea5541c35a..a0444e28c6e7 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -341,6 +341,35 @@ static int ksz8041_config_aneg(struct phy_device *phydev)
         return genphy_config_aneg(phydev);
 }
 
+static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
+                                            const u32 ksz_phy_id)
+{
+        int ret;
+
+        if ((phydev->phy_id & MICREL_PHY_ID_MASK) != ksz_phy_id)
+                return 0;
+
+        ret = phy_read(phydev, MII_BMSR);
+        if (ret < 0)
+                return ret;
+
+        /* KSZ8051 PHY and KSZ8794/KSZ8795/KSZ8765 switch share the same
+         * exact PHY ID. However, they can be told apart by the extended
+         * capability registers presence. The KSZ8051 PHY has them while
+         * the switch does not.
+         */
+        ret &= BMSR_ERCAP;
+        if (ksz_phy_id == PHY_ID_KSZ8051)
+                return ret;
+        else
+                return !ret;
+}
+
+static int ksz8051_match_phy_device(struct phy_device *phydev)
+{
+        return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8051);
+}
+
 static int ksz8081_config_init(struct phy_device *phydev)
 {
         /* KSZPHY_OMSO_FACTORY_TEST is set at de-assertion of the reset line
@@ -364,6 +393,11 @@ static int ksz8061_config_init(struct phy_device *phydev)
         return kszphy_config_init(phydev);
 }
 
+static int ksz8795_match_phy_device(struct phy_device *phydev)
+{
+        return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8795);
+}
+
 static int ksz9021_load_values_from_of(struct phy_device *phydev,
                                        const struct device_node *of_node,
                                        u16 reg,
@@ -1017,8 +1051,6 @@ static struct phy_driver ksphy_driver[] = {
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
 }, {
-        .phy_id         = PHY_ID_KSZ8051,
-        .phy_id_mask    = MICREL_PHY_ID_MASK,
         .name           = "Micrel KSZ8051",
         /* PHY_BASIC_FEATURES */
         .driver_data    = &ksz8051_type,
@@ -1029,6 +1061,7 @@ static struct phy_driver ksphy_driver[] = {
         .get_sset_count = kszphy_get_sset_count,
         .get_strings    = kszphy_get_strings,
         .get_stats      = kszphy_get_stats,
+        .match_phy_device = ksz8051_match_phy_device,
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
 }, {
@@ -1141,13 +1174,12 @@ static struct phy_driver ksphy_driver[] = {
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
 }, {
-        .phy_id         = PHY_ID_KSZ8795,
-        .phy_id_mask    = MICREL_PHY_ID_MASK,
         .name           = "Micrel KSZ8795",
         /* PHY_BASIC_FEATURES */
         .config_init    = kszphy_config_init,
         .config_aneg    = ksz8873mll_config_aneg,
         .read_status    = ksz8873mll_read_status,
+        .match_phy_device = ksz8795_match_phy_device,
         .suspend        = genphy_suspend,
         .resume         = genphy_resume,
 }, {