diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2017-12-02 10:50:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-04 17:17:08 +0100 |
| commit | 9753c21f55d4ca2b02bbe81448f2a552ce79d068 (patch) | |
| tree | 38f506bdc8cef5306608a98fcf692e34a96f7a0e /drivers/net/phy/broadcom.c | |
| parent | Merge branch 'ipv6-gre-collect_md' (diff) | |
| download | linux-9753c21f55d4ca2b02bbe81448f2a552ce79d068.tar.xz linux-9753c21f55d4ca2b02bbe81448f2a552ce79d068.zip | |
net: phy: broadcom: re-add mistakenly removed config settings
Previous patch mistakenly removed three chip-specific config settings.
Add them again.
Fixes: 80274abafc60 "net: phy: remove generic settings for callbacks config_aneg and read_status from drivers"
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/broadcom.c')
| -rw-r--r-- | drivers/net/phy/broadcom.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index e008411a3960..a8f69c5777bc 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -611,6 +611,7 @@ static struct phy_driver broadcom_drivers[] = { .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = bcm54xx_config_init, + .config_aneg = bcm5481_config_aneg, .ack_interrupt = bcm_phy_ack_intr, .config_intr = bcm_phy_config_intr, }, { @@ -620,6 +621,7 @@ static struct phy_driver broadcom_drivers[] = { .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = bcm54xx_config_init, + .config_aneg = bcm5481_config_aneg, .ack_interrupt = bcm_phy_ack_intr, .config_intr = bcm_phy_config_intr, }, { @@ -629,6 +631,7 @@ static struct phy_driver broadcom_drivers[] = { .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, .config_init = bcm5482_config_init, + .read_status = bcm5482_read_status, .ack_interrupt = bcm_phy_ack_intr, .config_intr = bcm_phy_config_intr, }, { |