Skip to content

Commit

Permalink
Revert "phy: bcm54213pe: configure the LED outputs to be more user-fr…
Browse files Browse the repository at this point in the history
…iendly"

This reverts commit 0f66932.
  • Loading branch information
lategoodbye authored and pelwell committed Jan 17, 2020
1 parent a0dac5b commit 1ae5a86
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
17 changes: 0 additions & 17 deletions drivers/net/phy/broadcom.c
Expand Up @@ -48,21 +48,6 @@ static int bcm54210e_config_init(struct phy_device *phydev)
return 0;
}

static void bcm54213pe_config_init(struct phy_device *phydev)
{
u16 val;

/* Enable ACT+LINK indication on ACTIVITY trigger */
val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_LEDCTL);
val |= BCM54XX_SHD_LEDCTL_ACTLINK_EN;
bcm_phy_write_shadow(phydev, BCM54XX_SHD_LEDCTL, val);

/* Set ACTIVITY on LED "1" output, LINKSPD[1] on LED "3" output */
val = BCM5482_SHD_LEDS1_LED1(BCM_LED_SRC_ACTIVITYLED) |
BCM5482_SHD_LEDS1_LED3(BCM_LED_SRC_LINKSPD1);
bcm_phy_write_shadow(phydev, BCM5482_SHD_LEDS1, val);
}

static int bcm54612e_config_init(struct phy_device *phydev)
{
int reg;
Expand Down Expand Up @@ -324,8 +309,6 @@ static int bcm54xx_config_init(struct phy_device *phydev)
err = bcm54210e_config_init(phydev);
if (err)
return err;
} else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54213PE) {
bcm54213pe_config_init(phydev);
} else if (BRCM_PHY_MODEL(phydev) == PHY_ID_BCM54612E) {
err = bcm54612e_config_init(phydev);
if (err)
Expand Down
4 changes: 0 additions & 4 deletions include/linux/brcmphy.h
Expand Up @@ -185,10 +185,6 @@
#define BCM54XX_SHD_SCR3_DLLAPD_DIS 0x0002
#define BCM54XX_SHD_SCR3_TRDDAPD 0x0004

/* 01001: Additional LED trigger options */
#define BCM54XX_SHD_LEDCTL 0x09
#define BCM54XX_SHD_LEDCTL_ACTLINK_EN 0x0010

/* 01010: Auto Power-Down */
#define BCM54XX_SHD_APD 0x0a
#define BCM_APD_CLR_MASK 0xFE9F /* clear bits 5, 6 & 8 */
Expand Down

0 comments on commit 1ae5a86

Please sign in to comment.