diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-26 23:27:52 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-26 23:27:52 +0000 |
commit | 961d5b4453e785abd2b053977af54681d64b0b09 (patch) | |
tree | e4e7e6b80657664175b1492d2ff2123ee2be6788 /target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch | |
parent | bc3d934148144bd0bb67e5a8c569bc707e57bf9e (diff) | |
download | upstream-961d5b4453e785abd2b053977af54681d64b0b09.tar.gz upstream-961d5b4453e785abd2b053977af54681d64b0b09.tar.bz2 upstream-961d5b4453e785abd2b053977af54681d64b0b09.zip |
brcm47xx: b44: This updates the phylib patches to the version send upstream
This uses a fixed phy instead of a dummy one.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39166
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch b/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch new file mode 100644 index 0000000000..d4eda982ee --- /dev/null +++ b/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-PHY-address-to-30-for-every-ext-PHY.patch @@ -0,0 +1,32 @@ +From 656a7c2b1210deddf76444ecc76e058c0404ce80 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Fri, 20 Dec 2013 02:16:12 +0100 +Subject: [PATCH 207/208] b44: do not set PHY address to 30 for every ext PHY + +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> +--- + drivers/net/ethernet/broadcom/b44.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/broadcom/b44.c ++++ b/drivers/net/ethernet/broadcom/b44.c +@@ -2413,8 +2413,11 @@ static int b44_init_one(struct ssb_devic + 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); |