Revert "phy: broadcom: split out the BCM54213PE from the BCM54210E IDs"

This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f.

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 405f5ff..56f0295 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -213,8 +213,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
        /* Abort if we are using an untested phy. */
        if (BRCM_PHY_MODEL(phydev) != PHY_ID_BCM57780 &&
            BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610 &&
-           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M &&
-           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM54213PE)
+           BRCM_PHY_MODEL(phydev) != PHY_ID_BCM50610M)
                return;
 
        val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_SCR3);
@@ -621,21 +620,13 @@ static struct phy_driver broadcom_drivers[] = {
        .config_intr    = bcm_phy_config_intr,
 }, {
        .phy_id         = PHY_ID_BCM54210E,
-       .phy_id_mask    = 0xffffffff,
+       .phy_id_mask    = 0xfffffff0,
        .name           = "Broadcom BCM54210E",
        /* PHY_GBIT_FEATURES */
        .config_init    = bcm54xx_config_init,
        .ack_interrupt  = bcm_phy_ack_intr,
        .config_intr    = bcm_phy_config_intr,
 }, {
-       .phy_id         = PHY_ID_BCM54213PE,
-       .phy_id_mask    = 0xffffffff,
-       .name           = "Broadcom BCM54213PE",
-       .features       = PHY_GBIT_FEATURES,
-       .config_init    = bcm54xx_config_init,
-       .ack_interrupt  = bcm_phy_ack_intr,
-       .config_intr    = bcm_phy_config_intr,
-}, {
        .phy_id         = PHY_ID_BCM5461,
        .phy_id_mask    = 0xfffffff0,
        .name           = "Broadcom BCM5461",
@@ -762,8 +753,7 @@ module_phy_driver(broadcom_drivers);
 static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
        { PHY_ID_BCM5411, 0xfffffff0 },
        { PHY_ID_BCM5421, 0xfffffff0 },
-       { PHY_ID_BCM54210E, 0xffffffff },
-       { PHY_ID_BCM54213PE, 0xffffffff },
+       { PHY_ID_BCM54210E, 0xfffffff0 },
        { PHY_ID_BCM5461, 0xfffffff0 },
        { PHY_ID_BCM54612E, 0xfffffff0 },
        { PHY_ID_BCM54616S, 0xfffffff0 },

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index bfb3721..6db2d9a 100644 (file)
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -20,7 +20,6 @@
 #define PHY_ID_BCM5411                 0x00206070
 #define PHY_ID_BCM5421                 0x002060e0
 #define PHY_ID_BCM54210E               0x600d84a0
-#define PHY_ID_BCM54213PE              0x600d84a2
 #define PHY_ID_BCM5464                 0x002060b0
 #define PHY_ID_BCM5461                 0x002060c0
 #define PHY_ID_BCM54612E               0x03625e60