aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:27:52 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:27:52 +0000
commit56273881683b469d30e4db0d01244ecb3939e44c (patch)
tree07ec939e396f89fd188d8f380e5b5c3ea409620d /target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch
parentcbfb4a3594a465308391e132114dabee50bc2e76 (diff)
downloadmaster-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.tar.gz
master-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.tar.bz2
master-187ad058-56273881683b469d30e4db0d01244ecb3939e44c.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39166 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch b/target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch
index 3dec7a2cd7..8ed078a3f1 100644
--- a/target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch
+++ b/target/linux/brcm47xx/patches-3.10/203-b44-abort-when-no-PHY-is-available-at-all.patch
@@ -1,13 +1,14 @@
-From d6668993d793d39e2c9d7699e8079462cae67f7e Mon Sep 17 00:00:00 2001
+From 7befa6abe09c84269b8af614a166409090346cf8 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Thu, 3 Oct 2013 20:49:10 +0200
-Subject: [PATCH 4/9] b44: abort when no PHY is available at all
+Date: Fri, 20 Dec 2013 02:16:08 +0100
+Subject: [PATCH 203/208] b44: abort when no PHY is available at all
When the phy address is 31, this means that there is no PHY connected
to this MAC at all, no internal and no external PHY. Reading these PHY
registers causes a system reset on some routers.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/net/ethernet/broadcom/b44.c | 6 ++++++
drivers/net/ethernet/broadcom/b44.h | 1 +
@@ -33,7 +34,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
@@ -282,6 +282,7 @@ struct ring_info {
#define B44_MCAST_TABLE_SIZE 32
- #define B44_PHY_ADDR_NO_LOACL_PHY 30 /* no local phy regs */
+ #define B44_PHY_ADDR_NO_LOCAL_PHY 30 /* no local phy regs */
+#define B44_PHY_ADDR_NO_PHY 31 /* no phy present at all */
#define B44_MDC_RATIO 5000000