Skip to content

Commit a7515af

Browse files
Doug Bergerdavem330
authored andcommitted
net: bcmgenet: fix MoCA LED control
When the bcmgenet_mii_config() code was refactored it was missed that the LED control for the MoCA interface got overwritten by the port_ctrl value. Its previous programming is restored here. Fixes: 4f8d81b ("net: bcmgenet: Refactor register access in bcmgenet_mii_config") Signed-off-by: Doug Berger <[email protected]> Acked-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9ca5e7e commit a7515af

File tree

1 file changed

+2
-9
lines changed
  • drivers/net/ethernet/broadcom/genet

1 file changed

+2
-9
lines changed

drivers/net/ethernet/broadcom/genet/bcmmii.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,6 @@ void bcmgenet_phy_power_set(struct net_device *dev, bool enable)
176176

177177
static void bcmgenet_moca_phy_setup(struct bcmgenet_priv *priv)
178178
{
179-
u32 reg;
180-
181-
if (!GENET_IS_V5(priv)) {
182-
/* Speed settings are set in bcmgenet_mii_setup() */
183-
reg = bcmgenet_sys_readl(priv, SYS_PORT_CTRL);
184-
reg |= LED_ACT_SOURCE_MAC;
185-
bcmgenet_sys_writel(priv, reg, SYS_PORT_CTRL);
186-
}
187-
188179
if (priv->hw_params->flags & GENET_HAS_MOCA_LINK_DET)
189180
fixed_phy_set_link_update(priv->dev->phydev,
190181
bcmgenet_fixed_phy_link_update);
@@ -217,6 +208,8 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
217208

218209
if (!phy_name) {
219210
phy_name = "MoCA";
211+
if (!GENET_IS_V5(priv))
212+
port_ctrl |= LED_ACT_SOURCE_MAC;
220213
bcmgenet_moca_phy_setup(priv);
221214
}
222215
break;

0 commit comments

Comments
 (0)