As TI Gigabit PHYs do not support EEE, use the newly introduced phy_get_features_no_eee() to read the features but mark EEE as disabled. Signed-off-by: Russell King (Oracle) --- drivers/net/phy/dp83822.c | 3 +++ drivers/net/phy/dp83867.c | 1 + drivers/net/phy/dp83869.c | 1 + drivers/net/phy/dp83tc811.c | 1 + 4 files changed, 6 insertions(+) diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index 33db21251f2e..20caf9a5faa7 100644 --- a/drivers/net/phy/dp83822.c +++ b/drivers/net/phy/dp83822.c @@ -1160,6 +1160,7 @@ static int dp83822_led_hw_control_get(struct phy_device *phydev, u8 index, .name = (_name), \ /* PHY_BASIC_FEATURES */ \ .probe = dp83822_probe, \ + .get_features = phy_get_features_no_eee, \ .soft_reset = dp83822_phy_reset, \ .config_init = dp83822_config_init, \ .read_status = dp83822_read_status, \ @@ -1180,6 +1181,7 @@ static int dp83822_led_hw_control_get(struct phy_device *phydev, u8 index, .name = (_name), \ /* PHY_BASIC_FEATURES */ \ .probe = dp8382x_probe, \ + .get_features = phy_get_features_no_eee, \ .soft_reset = dp83822_phy_reset, \ .config_init = dp83825_config_init, \ .get_wol = dp83822_get_wol, \ @@ -1196,6 +1198,7 @@ static int dp83822_led_hw_control_get(struct phy_device *phydev, u8 index, .name = (_name), \ /* PHY_BASIC_FEATURES */ \ .probe = dp83826_probe, \ + .get_features = phy_get_features_no_eee, \ .soft_reset = dp83822_phy_reset, \ .config_init = dp83826_config_init, \ .get_wol = dp83822_get_wol, \ diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index 36a0c1b7f59c..da055ff861be 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -1124,6 +1124,7 @@ static struct phy_driver dp83867_driver[] = { /* PHY_GBIT_FEATURES */ .probe = dp83867_probe, + .get_features = phy_get_features_no_eee, .config_init = dp83867_config_init, .soft_reset = dp83867_phy_reset, diff --git a/drivers/net/phy/dp83869.c b/drivers/net/phy/dp83869.c index 1f381d7b13ff..4400654b0f72 100644 --- a/drivers/net/phy/dp83869.c +++ b/drivers/net/phy/dp83869.c @@ -906,6 +906,7 @@ static int dp83869_phy_reset(struct phy_device *phydev) PHY_ID_MATCH_MODEL(_id), \ .name = (_name), \ .probe = dp83869_probe, \ + .get_features = phy_get_features_no_eee, \ .config_init = dp83869_config_init, \ .soft_reset = dp83869_phy_reset, \ .config_intr = dp83869_config_intr, \ diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c index e480c2a07450..92c5f3cfee9e 100644 --- a/drivers/net/phy/dp83tc811.c +++ b/drivers/net/phy/dp83tc811.c @@ -390,6 +390,7 @@ static struct phy_driver dp83811_driver[] = { .phy_id_mask = 0xfffffff0, .name = "TI DP83TC811", /* PHY_BASIC_FEATURES */ + .get_features = phy_get_features_no_eee, .config_init = dp83811_config_init, .config_aneg = dp83811_config_aneg, .soft_reset = dp83811_phy_reset, -- 2.47.3