aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-12-26 23:27:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-12-26 23:27:52 +0000
commit961d5b4453e785abd2b053977af54681d64b0b09 (patch)
treee4e7e6b80657664175b1492d2ff2123ee2be6788 /target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch
parentbc3d934148144bd0bb67e5a8c569bc707e57bf9e (diff)
downloadupstream-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-addr-to-30-for-every-ext-phy.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch b/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch
deleted file mode 100644
index 2b0c8ff9cf..0000000000
--- a/target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c2ecc401a08f0bda3b2483b93989d9792cadf6b2 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Mon, 21 Oct 2013 20:30:04 +0200
-Subject: [PATCH 8/9] b44: do not set phy addr to 30 for every ext phy
-
----
- 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
-@@ -2408,8 +2408,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_LOACL_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);