| diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c |
| index 75d8351..ac8dd8e 100644 |
| --- a/drivers/net/phy/aquantia_main.c |
| +++ b/drivers/net/phy/aquantia_main.c |
| @@ -22,6 +22,7 @@ |
| #define PHY_ID_AQR107 0x03a1b4e0 |
| #define PHY_ID_AQCS109 0x03a1b5c2 |
| #define PHY_ID_AQR405 0x03a1b4b0 |
| +#define PHY_ID_AQR113C 0x31c31c12 |
| |
| #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 |
| #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) |
| @@ -268,17 +268,6 @@ static int aqr_read_status(struct phy_device *phydev) |
| return genphy_c45_read_status(phydev); |
| } |
| |
| -static int aqr107_read_downshift_event(struct phy_device *phydev) |
| -{ |
| - int val; |
| - |
| - val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_STATUS1); |
| - if (val < 0) |
| - return val; |
| - |
| - return !!(val & MDIO_AN_TX_VEND_INT_STATUS1_DOWNSHIFT); |
| -} |
| - |
| static int aqr107_read_rate(struct phy_device *phydev) |
| { |
| int val; |
| @@ -353,13 +342,7 @@ static int aqr107_read_status(struct phy_device *phydev) |
| break; |
| } |
| |
| - val = aqr107_read_downshift_event(phydev); |
| - if (val <= 0) |
| - return val; |
| - |
| - phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n"); |
| - |
| - /* Read downshifted rate from vendor register */ |
| + /* Read possibly downshifted rate from vendor register */ |
| return aqr107_read_rate(phydev); |
| } |
| |
| @@ -500,9 +483,6 @@ static int aqr107_config_init(struct phy_device *phydev) |
| if (!ret) |
| aqr107_chip_info(phydev); |
| |
| - /* ensure that a latched downshift event is cleared */ |
| - aqr107_read_downshift_event(phydev); |
| - |
| return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT); |
| } |
| |
| @@ -527,9 +507,6 @@ static int aqcs109_config_init(struct phy_device *phydev) |
| if (ret) |
| return ret; |
| |
| - /* ensure that a latched downshift event is cleared */ |
| - aqr107_read_downshift_event(phydev); |
| - |
| return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT); |
| } |
| |
| @@ -695,6 +696,24 @@ static struct phy_driver aqr_driver[] = { |
| .ack_interrupt = aqr_ack_interrupt, |
| .read_status = aqr_read_status, |
| }, |
| +{ |
| + PHY_ID_MATCH_MODEL(PHY_ID_AQR113C), |
| + .name = "Aquantia AQR113C", |
| + .probe = aqr107_probe, |
| + .config_init = aqr107_config_init, |
| + .config_aneg = aqr_config_aneg, |
| + .config_intr = aqr_config_intr, |
| + .ack_interrupt = aqr_ack_interrupt, |
| + .read_status = aqr107_read_status, |
| + .get_tunable = aqr107_get_tunable, |
| + .set_tunable = aqr107_set_tunable, |
| + .suspend = aqr107_suspend, |
| + .resume = aqr107_resume, |
| + .get_sset_count = aqr107_get_sset_count, |
| + .get_strings = aqr107_get_strings, |
| + .get_stats = aqr107_get_stats, |
| + .link_change_notify = aqr107_link_change_notify, |
| +}, |
| }; |
| |
| module_phy_driver(aqr_driver); |
| @@ -707,6 +726,7 @@ static struct mdio_device_id __maybe_unused aqr_tbl[] = { |
| { PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, |
| { PHY_ID_MATCH_MODEL(PHY_ID_AQCS109) }, |
| { PHY_ID_MATCH_MODEL(PHY_ID_AQR405) }, |
| + { PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) }, |
| { } |
| }; |
| |