summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.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/206-b44-activate-PHY-when-MAC-is-off.patch
parentbc3d934148144bd0bb67e5a8c569bc707e57bf9e (diff)
downloadmtk-20170518-961d5b4453e785abd2b053977af54681d64b0b09.zip
mtk-20170518-961d5b4453e785abd2b053977af54681d64b0b09.tar.gz
mtk-20170518-961d5b4453e785abd2b053977af54681d64b0b09.tar.bz2
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/206-b44-activate-PHY-when-MAC-is-off.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch b/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch
index abfee80..57212bb 100644
--- a/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch
+++ b/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch
@@ -1,20 +1,21 @@
-From f6a8d917c3efcfb974097ef4b345e8cda5283bab Mon Sep 17 00:00:00 2001
+From bea69c47f5b93b3142f8833f8a34b666d5d7d6a7 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 6 Oct 2013 17:58:24 +0200
-Subject: [PATCH 7/9] b44: activate PHY when MAC is off
+Date: Fri, 20 Dec 2013 02:16:11 +0100
+Subject: [PATCH 206/208] b44: activate PHY when MAC is off
Without this patch we can not access the PHY when the MAC is switched
off. This PHY access is needed to configure the switch, which is done
through PHY registers.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/broadcom/b44.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -1358,7 +1358,10 @@ static void b44_halt(struct b44 *bp)
+@@ -1360,7 +1360,10 @@ static void b44_halt(struct b44 *bp)
bw32(bp, B44_MAC_CTRL, MAC_CTRL_PHY_PDOWN);
/* now reset the chip, but without enabling the MAC&PHY
* part of it. This has to be done _after_ we shut down the PHY */