aboutsummaryrefslogtreecommitdiffstats
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-10-06 18:31:32 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-06 18:31:32 +0000
commit2c5e4aa6add7eefb6663893a47cc6ffbb0241c68 (patch)
treec26da8ee9f0d3c8bf51af2bc020dd2df536bd625 /target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch
parent048fc8f0c149731229463f6fe97ce0a536b33a99 (diff)
downloadupstream-2c5e4aa6add7eefb6663893a47cc6ffbb0241c68.tar.gz
upstream-2c5e4aa6add7eefb6663893a47cc6ffbb0241c68.tar.bz2
upstream-2c5e4aa6add7eefb6663893a47cc6ffbb0241c68.zip
brcm47xx: b44: fix some problems with the phy
* do not try initialize a unused phy * some improvements to the phylib patch * do not turn the phy off when mac is off Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38306
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.patch28
1 files changed, 28 insertions, 0 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
new file mode 100644
index 0000000000..e6c39b0547
--- /dev/null
+++ b/target/linux/brcm47xx/patches-3.10/206-b44-activate-PHY-when-MAC-is-off.patch
@@ -0,0 +1,28 @@
+From 444044a410d4cf3b6dd462f2c9352d56039d9e07 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 6/6] 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>
+---
+ 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)
+ 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 */
+- b44_chip_reset(bp, B44_CHIP_RESET_PARTIAL);
++ if (bp->has_phy)
++ b44_chip_reset(bp, B44_CHIP_RESET_FULL);
++ else
++ b44_chip_reset(bp, B44_CHIP_RESET_PARTIAL);
+ }
+
+ /* bp->lock is held. */