Skip to contentSkip to conversation

net: phy: broadcom: re-add mistakenly removed config settings

PATCH Applied Heiner Kallweit 2 participants 2 messages Dec 2, 2017 – Dec 4, 2017

Subsystems (4)
Networking Network drivers Ethernet PHY Broadcom Ethernet PHY drivers
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/net/phy/broadcom.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/phy/broadcom.c +3 -0
index e008411a3..a8f69c577 100644
@@ -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,
 }, {
Signature · 1 line
2.15.1
maintainer Applied
#1 lore raw

From: Heiner Kallweit <[email protected]>
Date: Sat, 2 Dec 2017 10:50:37 +0100

Quoted 5 lines

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 <[email protected]>

Applied.