Commit 476cc6c9 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: bcm87xx: improve bcm87xx_config_init and feature detection

PHY drivers don't have to and shouldn't fiddle with phylib internals.
Most of the code in bcm87xx_config_init() can be removed because
phylib takes care.

In addition I replaced usage of PHY_10GBIT_FEC_FEATURES with an
implementation of the get_features callback. PHY_10GBIT_FEC_FEATURES
is used by this driver only and it's questionable whether there
will be any other PHY supporting this mode only. Having said that
in one of the next kernel versions we may decide to remove it.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8fb91c35
...@@ -81,22 +81,18 @@ static int bcm87xx_of_reg_init(struct phy_device *phydev) ...@@ -81,22 +81,18 @@ static int bcm87xx_of_reg_init(struct phy_device *phydev)
} }
#endif /* CONFIG_OF_MDIO */ #endif /* CONFIG_OF_MDIO */
static int bcm87xx_config_init(struct phy_device *phydev) static int bcm87xx_get_features(struct phy_device *phydev)
{ {
linkmode_zero(phydev->supported);
linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT, linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT,
phydev->supported); phydev->supported);
linkmode_zero(phydev->advertising);
linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseR_FEC_BIT,
phydev->advertising);
phydev->state = PHY_NOLINK;
phydev->autoneg = AUTONEG_DISABLE;
bcm87xx_of_reg_init(phydev);
return 0; return 0;
} }
static int bcm87xx_config_init(struct phy_device *phydev)
{
return bcm87xx_of_reg_init(phydev);
}
static int bcm87xx_config_aneg(struct phy_device *phydev) static int bcm87xx_config_aneg(struct phy_device *phydev)
{ {
return -EINVAL; return -EINVAL;
...@@ -194,7 +190,7 @@ static struct phy_driver bcm87xx_driver[] = { ...@@ -194,7 +190,7 @@ static struct phy_driver bcm87xx_driver[] = {
.phy_id = PHY_ID_BCM8706, .phy_id = PHY_ID_BCM8706,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Broadcom BCM8706", .name = "Broadcom BCM8706",
.features = PHY_10GBIT_FEC_FEATURES, .get_features = bcm87xx_get_features,
.config_init = bcm87xx_config_init, .config_init = bcm87xx_config_init,
.config_aneg = bcm87xx_config_aneg, .config_aneg = bcm87xx_config_aneg,
.read_status = bcm87xx_read_status, .read_status = bcm87xx_read_status,
...@@ -206,7 +202,7 @@ static struct phy_driver bcm87xx_driver[] = { ...@@ -206,7 +202,7 @@ static struct phy_driver bcm87xx_driver[] = {
.phy_id = PHY_ID_BCM8727, .phy_id = PHY_ID_BCM8727,
.phy_id_mask = 0xffffffff, .phy_id_mask = 0xffffffff,
.name = "Broadcom BCM8727", .name = "Broadcom BCM8727",
.features = PHY_10GBIT_FEC_FEATURES, .get_features = bcm87xx_get_features,
.config_init = bcm87xx_config_init, .config_init = bcm87xx_config_init,
.config_aneg = bcm87xx_config_aneg, .config_aneg = bcm87xx_config_aneg,
.read_status = bcm87xx_read_status, .read_status = bcm87xx_read_status,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment