aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-12-18 07:25:13 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-12-18 07:25:13 +0000
commit87582f26e64f2e82fe6512a58f7cc1191a946d63 (patch)
tree3d5dee3bc9a754e876dcebb719a39bccc38fb4c8 /target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch
parent2ac80a466b2eb07029b6119bcebb0c8107e241c6 (diff)
downloadmaster-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.tar.gz
master-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.tar.bz2
master-187ad058-87582f26e64f2e82fe6512a58f7cc1191a946d63.zip
brcm47xx: add kernel 4.4 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47930 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch')
-rw-r--r--target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch
new file mode 100644
index 0000000000..04f6832169
--- /dev/null
+++ b/target/linux/brcm47xx/patches-4.4/210-b44_phy_fix.patch
@@ -0,0 +1,54 @@
+--- a/drivers/net/ethernet/broadcom/b44.c
++++ b/drivers/net/ethernet/broadcom/b44.c
+@@ -431,10 +431,34 @@ static void b44_wap54g10_workaround(stru
+ error:
+ pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
+ }
++
++static void b44_bcm47xx_workarounds(struct b44 *bp)
++{
++ char buf[20];
++ struct ssb_device *sdev = bp->sdev;
++
++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
++ if (sdev->bus->sprom.board_num == 100) {
++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
++ } else {
++ /* WL-HDD */
++ if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
++ !strncmp(buf, "WL300-", strlen("WL300-"))) {
++ if (sdev->bus->sprom.et0phyaddr == 0 &&
++ sdev->bus->sprom.et1phyaddr == 1)
++ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
++ }
++ }
++ return;
++}
+ #else
+ static inline void b44_wap54g10_workaround(struct b44 *bp)
+ {
+ }
++
++static inline void b44_bcm47xx_workarounds(struct b44 *bp)
++{
++}
+ #endif
+
+ static int b44_setup_phy(struct b44 *bp)
+@@ -443,6 +467,7 @@ static int b44_setup_phy(struct b44 *bp)
+ int err;
+
+ b44_wap54g10_workaround(bp);
++ b44_bcm47xx_workarounds(bp);
+
+ if (bp->flags & B44_FLAG_EXTERNAL_PHY)
+ return 0;
+@@ -2170,6 +2195,8 @@ static int b44_get_invariants(struct b44
+ * valid PHY address. */
+ bp->phy_addr &= 0x1F;
+
++ b44_bcm47xx_workarounds(bp);
++
+ memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
+
+ if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){