From 03c2e3cc4a95a9f2ab496b177a3d146bfadf4eb1 Mon Sep 17 00:00:00 2001 From: James Hughes Date: Thu, 7 Nov 2019 14:59:59 +0000 Subject: [PATCH] net:phy:2711 Change the default ethernet LED actions raspberrypi inclusion category: feature bugzilla: 50432 -------------------------------- This should return default behaviour back to that of previous releases. Signed-off-by: Fang Yafen Signed-off-by: Zheng Zengkai --- drivers/net/phy/broadcom.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 457b214d3601..84ec5f2fae73 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -258,7 +258,7 @@ static int bcm54xx_config_init(struct phy_device *phydev) { int reg, err, val; u32 led_modes[] = {BCM_LED_MULTICOLOR_LINK_ACT, - BCM_LED_MULTICOLOR_LINK_ACT}; + BCM_LED_MULTICOLOR_LINK}; struct device_node *np = phydev->mdio.dev.of_node; reg = phy_read(phydev, MII_BCM54XX_ECR); @@ -310,10 +310,6 @@ static int bcm54xx_config_init(struct phy_device *phydev) of_property_read_u32_array(np, "led-modes", led_modes, 2); - /* Encode link speed into LED1 and LED3 pair (green/amber). - * Also flash these two LEDs on activity. This means configuring - * them for MULTICOLOR and encoding link/activity into them. - */ val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) | BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1); bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val); -- GitLab