net: phy: broadcom: Do not modify LED configuration for SFP module PHYs

bcm54xx_config_init was modifying the PHY LED configuration to enable link
and activity indications. However, some SFP modules (such as Bel-Fuse
SFP-1GBT-06) have no LEDs but use the LED outputs to control the SFP LOS
signal, and modifying the LED settings will cause the LOS output to
malfunction. Skip this configuration for PHYs which are bound to an SFP
bus.

Signed-off-by: Robert Hancock <robert.hancock@calian.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 8e7fc33..fa0be59 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -366,18 +366,24 @@ static int bcm54xx_config_init(struct phy_device *phydev)
 
        bcm54xx_phydsp_config(phydev);
 
-       /* Encode link speed into LED1 and LED3 pair (green/amber).
+       /* For non-SFP setups, 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.
+        * Don't do this for devices on an SFP module, since some of these
+        * use the LED outputs to control the SFP LOS signal, and changing
+        * these settings will cause LOS to malfunction.
         */
-       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);
-
-       val = BCM_LED_MULTICOLOR_IN_PHASE |
-               BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
-               BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
-       bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
+       if (!phy_on_sfp(phydev)) {
+               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);
+
+               val = BCM_LED_MULTICOLOR_IN_PHASE |
+                       BCM5482_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |
+                       BCM5482_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);
+               bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);
+       }
 
        return 0;
 }