5757#define RTL8366RB_POWER_SAVE 0x15
5858#define RTL8366RB_POWER_SAVE_ON BIT(12)
5959
60- #define RTL_SUPPORTS_5000FULL BIT(14)
61- #define RTL_SUPPORTS_2500FULL BIT(13)
62- #define RTL_SUPPORTS_10000FULL BIT(0)
63- #define RTL_ADV_2500FULL BIT(7)
64- #define RTL_LPADV_10000FULL BIT(11)
65- #define RTL_LPADV_5000FULL BIT(6)
66- #define RTL_LPADV_2500FULL BIT(5)
67-
6860#define RTL9000A_GINMR 0x14
6961#define RTL9000A_GINMR_LINK_STATUS BIT(4)
7062
@@ -674,11 +666,11 @@ static int rtl822x_get_features(struct phy_device *phydev)
674666 return val ;
675667
676668 linkmode_mod_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT ,
677- phydev -> supported , val & RTL_SUPPORTS_2500FULL );
669+ phydev -> supported , val & MDIO_PMA_SPEED_2_5G );
678670 linkmode_mod_bit (ETHTOOL_LINK_MODE_5000baseT_Full_BIT ,
679- phydev -> supported , val & RTL_SUPPORTS_5000FULL );
671+ phydev -> supported , val & MDIO_PMA_SPEED_5G );
680672 linkmode_mod_bit (ETHTOOL_LINK_MODE_10000baseT_Full_BIT ,
681- phydev -> supported , val & RTL_SUPPORTS_10000FULL );
673+ phydev -> supported , val & MDIO_SPEED_10G );
682674
683675 return genphy_read_abilities (phydev );
684676}
@@ -692,10 +684,11 @@ static int rtl822x_config_aneg(struct phy_device *phydev)
692684
693685 if (linkmode_test_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT ,
694686 phydev -> advertising ))
695- adv2500 = RTL_ADV_2500FULL ;
687+ adv2500 = MDIO_AN_10GBT_CTRL_ADV2_5G ;
696688
697689 ret = phy_modify_paged_changed (phydev , 0xa5d , 0x12 ,
698- RTL_ADV_2500FULL , adv2500 );
690+ MDIO_AN_10GBT_CTRL_ADV2_5G ,
691+ adv2500 );
699692 if (ret < 0 )
700693 return ret ;
701694 }
@@ -714,11 +707,14 @@ static int rtl822x_read_status(struct phy_device *phydev)
714707 return lpadv ;
715708
716709 linkmode_mod_bit (ETHTOOL_LINK_MODE_10000baseT_Full_BIT ,
717- phydev -> lp_advertising , lpadv & RTL_LPADV_10000FULL );
710+ phydev -> lp_advertising ,
711+ lpadv & MDIO_AN_10GBT_STAT_LP10G );
718712 linkmode_mod_bit (ETHTOOL_LINK_MODE_5000baseT_Full_BIT ,
719- phydev -> lp_advertising , lpadv & RTL_LPADV_5000FULL );
713+ phydev -> lp_advertising ,
714+ lpadv & MDIO_AN_10GBT_STAT_LP5G );
720715 linkmode_mod_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT ,
721- phydev -> lp_advertising , lpadv & RTL_LPADV_2500FULL );
716+ phydev -> lp_advertising ,
717+ lpadv & MDIO_AN_10GBT_STAT_LP2_5G );
722718 }
723719
724720 ret = genphy_read_status (phydev );
@@ -736,7 +732,7 @@ static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
736732 val = phy_read (phydev , 0x13 );
737733 phy_write (phydev , RTL821x_PAGE_SELECT , 0 );
738734
739- return val >= 0 && val & RTL_SUPPORTS_2500FULL ;
735+ return val >= 0 && val & MDIO_PMA_SPEED_2_5G ;
740736}
741737
742738static int rtlgen_match_phy_device (struct phy_device * phydev )
0 commit comments