Skip to content

Commit

Permalink
b44: do not set PHY address to 30 for every ext PHY
Browse files Browse the repository at this point in the history
b44_phy_reset() will fail for an external PHY and only work with the
internal PHY, this was an old workaround when the detection of an
external switch based on the PHY address failed and it is not needed
any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Hauke Mehrtens authored and David S. Miller committed Dec 21, 2013
1 parent bea69c4 commit 656a7c2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/ethernet/broadcom/b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -2412,8 +2412,11 @@ static int b44_init_one(struct ssb_device *sdev,
b44_chip_reset(bp, B44_CHIP_RESET_FULL);

/* do a phy reset to test if there is an active phy */
if (b44_phy_reset(bp) < 0)
bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
err = b44_phy_reset(bp);
if (err < 0) {
dev_err(sdev->dev, "phy reset failed\n");
goto err_out_unregister_netdev;
}

if (bp->flags & B44_FLAG_EXTERNAL_PHY) {
err = b44_register_phy_one(bp);
Expand Down

0 comments on commit 656a7c2

Please sign in to comment.