Commit 57fd7d59 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: broadcom: Rename LED registers 



These registers are common to most PHYs and are not specific to the
BCM5482, renamed the constants accordingly, no functional change.

Signed-off-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54a8c43f

drivers/net/phy/broadcom.c

+5 −5
Original line number Diff line number Diff line
@@ -414,13 +414,13 @@ static int bcm54xx_config_init(struct phy_device *phydev) 
	 * these settings will cause LOS to malfunction.

	 */

	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 = BCM54XX_SHD_LEDS1_LED1(BCM_LED_SRC_MULTICOLOR1) |

			BCM54XX_SHD_LEDS1_LED3(BCM_LED_SRC_MULTICOLOR1);

		bcm_phy_write_shadow(phydev, BCM54XX_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);

			BCM54XX_SHD_LEDS1_LED1(BCM_LED_MULTICOLOR_LINK_ACT) |

			BCM54XX_SHD_LEDS1_LED3(BCM_LED_MULTICOLOR_LINK_ACT);

		bcm_phy_write_exp(phydev, BCM_EXP_MULTICOLOR, val);

	}

include/linux/brcmphy.h

+3 −3
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ 
#define  BCM_NO_ANEG_APD_EN		0x0060 /* bits 5 & 6 */

#define  BCM_APD_SINGLELP_EN	0x0100 /* Bit 8 */



#define BCM5482_SHD_LEDS1	0x0d	/* 01101: LED Selector 1 */

#define BCM54XX_SHD_LEDS1	0x0d	/* 01101: LED Selector 1 */

					/* LED3 / ~LINKSPD[2] selector */

#define BCM5482_SHD_LEDS1_LED3(src)	((src & 0xf) << 4)

#define BCM54XX_SHD_LEDS1_LED3(src)	((src & 0xf) << 4)

					/* LED1 / ~LINKSPD[1] selector */

#define BCM5482_SHD_LEDS1_LED1(src)	((src & 0xf) << 0)

#define BCM54XX_SHD_LEDS1_LED1(src)	((src & 0xf) << 0)

#define BCM54XX_SHD_RGMII_MODE	0x0b	/* 01011: RGMII Mode Selector */

#define BCM5482_SHD_SSD		0x14	/* 10100: Secondary SerDes control */

#define BCM5482_SHD_SSD_LEDM	0x0008	/* SSD LED Mode enable */