diff mbox series

[net-next] net: phy: broadcom: re-add mistakenly removed config settings

Message ID ee8bb979-5aa3-9bd9-2bdc-e3bd35ffc382@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net-next] net: phy: broadcom: re-add mistakenly removed config settings | expand

Commit Message

Heiner Kallweit Dec. 2, 2017, 9:50 a.m. UTC 
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>
---
 drivers/net/phy/broadcom.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

David Miller Dec. 4, 2017, 4:17 p.m. UTC | #1 
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Sat, 2 Dec 2017 10:50:37 +0100

> 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>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index e008411a3..a8f69c577 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,
 }, {