summaryrefslogtreecommitdiff
path: root/target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-25 19:27:08 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-05-25 19:27:08 +0000
commita3c9e2fe7a4ff8242cdcdeec5f76f0988359aed7 (patch)
tree08435ff1601e66dfb605ae9cdbca48b8a428ac4c /target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch
parent97d0245acba9f3f2038cb4047c2659f88ee277c5 (diff)
brcm47xx: initial 2.6.39 support for brcm47xx
Thank you Peter Wagner for the patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27008 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch
new file mode 100644
index 0000000000..ef023c5063
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.39/210-b44_phy_fix.patch
@@ -0,0 +1,61 @@
+--- a/drivers/net/b44.c
++++ b/drivers/net/b44.c
+@@ -411,10 +411,41 @@ static void b44_wap54g10_workaround(stru
+ error:
+ pr_warning("PHY: cannot reset MII transceiver isolate bit\n");
+ }
++
++static inline int startswith (const char *source, const char *cmp)
++{
++ return !strncmp(source,cmp,strlen(cmp));
++}
++
++static inline void b44_bcm47xx_workarounds(struct b44 *bp)
++{
++ char buf[20];
++ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
++ if (nvram_getenv("boardnum", buf, sizeof(buf)) > 0)
++ return;
++ if (simple_strtoul(buf, NULL, 0) == 100) {
++ bp->phy_addr = B44_PHY_ADDR_NO_PHY;
++ } else {
++ /* WL-HDD */
++ struct ssb_device *sdev = bp->sdev;
++ if (nvram_getenv("hardware_version", buf, sizeof(buf)) > 0)
++ return;
++ if (startswith(buf, "WL300-")) {
++ if (sdev->bus->sprom.et0phyaddr == 0 &&
++ sdev->bus->sprom.et1phyaddr == 1)
++ bp->phy_addr = B44_PHY_ADDR_NO_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)
+@@ -423,6 +454,7 @@ static int b44_setup_phy(struct b44 *bp)
+ int err;
+
+ b44_wap54g10_workaround(bp);
++ b44_bcm47xx_workarounds(bp);
+
+ if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
+ return 0;
+@@ -2088,6 +2120,8 @@ static int __devinit b44_get_invariants(
+ * valid PHY address. */
+ bp->phy_addr &= 0x1F;
+
++ b44_bcm47xx_workarounds(bp);
++
+ memcpy(bp->dev->dev_addr, addr, 6);
+
+ if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){