aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-12-10 20:55:30 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-13 15:33:44 -0500
commit3c17dd414864bbd637379455e2f4885ef3aa7778 (patch)
treee039dd70d7b7afb216ce6aba65ad4b8293942552
parentc56da252a7608bd06c4527e3ce5dd2090c7922b8 (diff)
b43: N-PHY: update some init values
Changes were obtained from MMIO dump from 5.100.82.112. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_n.c24
-rw-r--r--drivers/net/wireless/b43/radio_2056.c10
2 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index f40d8049d310..f540e482b3c7 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -1591,18 +1591,18 @@ static void b43_nphy_workarounds_rev3plus(struct b43_wldev *dev)
1591 0x70); 1591 0x70);
1592 } 1592 }
1593 1593
1594 b43_phy_write(dev, 0x224, 0x039C); 1594 b43_phy_write(dev, 0x224, 0x03eb);
1595 b43_phy_write(dev, 0x225, 0x0357); 1595 b43_phy_write(dev, 0x225, 0x03eb);
1596 b43_phy_write(dev, 0x226, 0x0317); 1596 b43_phy_write(dev, 0x226, 0x0341);
1597 b43_phy_write(dev, 0x227, 0x02D7); 1597 b43_phy_write(dev, 0x227, 0x0341);
1598 b43_phy_write(dev, 0x228, 0x039C); 1598 b43_phy_write(dev, 0x228, 0x042b);
1599 b43_phy_write(dev, 0x229, 0x0357); 1599 b43_phy_write(dev, 0x229, 0x042b);
1600 b43_phy_write(dev, 0x22A, 0x0317); 1600 b43_phy_write(dev, 0x22a, 0x0381);
1601 b43_phy_write(dev, 0x22B, 0x02D7); 1601 b43_phy_write(dev, 0x22b, 0x0381);
1602 b43_phy_write(dev, 0x22C, 0x039C); 1602 b43_phy_write(dev, 0x22c, 0x042b);
1603 b43_phy_write(dev, 0x22D, 0x0357); 1603 b43_phy_write(dev, 0x22d, 0x042b);
1604 b43_phy_write(dev, 0x22E, 0x0317); 1604 b43_phy_write(dev, 0x22e, 0x0381);
1605 b43_phy_write(dev, 0x22F, 0x02D7); 1605 b43_phy_write(dev, 0x22f, 0x0381);
1606} 1606}
1607 1607
1608static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev) 1608static void b43_nphy_workarounds_rev1_2(struct b43_wldev *dev)
diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c
index a01f776ca4de..4a42994f4933 100644
--- a/drivers/net/wireless/b43/radio_2056.c
+++ b/drivers/net/wireless/b43/radio_2056.c
@@ -1572,14 +1572,14 @@ static const struct b2056_inittab_entry b2056_inittab_rev6_syn[] = {
1572 [B2056_SYN_PLL_XTAL5] = { .ghz5 = 0x0077, .ghz2 = 0x0077, NOUPLOAD, }, 1572 [B2056_SYN_PLL_XTAL5] = { .ghz5 = 0x0077, .ghz2 = 0x0077, NOUPLOAD, },
1573 [B2056_SYN_PLL_XTAL6] = { .ghz5 = 0x0007, .ghz2 = 0x0007, NOUPLOAD, }, 1573 [B2056_SYN_PLL_XTAL6] = { .ghz5 = 0x0007, .ghz2 = 0x0007, NOUPLOAD, },
1574 [B2056_SYN_PLL_REFDIV] = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, }, 1574 [B2056_SYN_PLL_REFDIV] = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },
1575 [B2056_SYN_PLL_PFD] = { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, }, 1575 [B2056_SYN_PLL_PFD] = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
1576 [B2056_SYN_PLL_CP1] = { .ghz5 = 0x000f, .ghz2 = 0x000f, NOUPLOAD, }, 1576 [B2056_SYN_PLL_CP1] = { .ghz5 = 0x000f, .ghz2 = 0x000f, NOUPLOAD, },
1577 [B2056_SYN_PLL_CP2] = { .ghz5 = 0x0030, .ghz2 = 0x0030, NOUPLOAD, }, 1577 [B2056_SYN_PLL_CP2] = { .ghz5 = 0x003f, .ghz2 = 0x003f, UPLOAD, },
1578 [B2056_SYN_PLL_CP3] = { .ghz5 = 0x0032, .ghz2 = 0x0032, NOUPLOAD, }, 1578 [B2056_SYN_PLL_CP3] = { .ghz5 = 0x0032, .ghz2 = 0x0032, NOUPLOAD, },
1579 [B2056_SYN_PLL_LOOPFILTER1] = { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, }, 1579 [B2056_SYN_PLL_LOOPFILTER1] = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
1580 [B2056_SYN_PLL_LOOPFILTER2] = { .ghz5 = 0x000d, .ghz2 = 0x000d, NOUPLOAD, }, 1580 [B2056_SYN_PLL_LOOPFILTER2] = { .ghz5 = 0x0006, .ghz2 = 0x0006, UPLOAD, },
1581 [B2056_SYN_PLL_LOOPFILTER3] = { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, }, 1581 [B2056_SYN_PLL_LOOPFILTER3] = { .ghz5 = 0x0004, .ghz2 = 0x0004, NOUPLOAD, },
1582 [B2056_SYN_PLL_LOOPFILTER4] = { .ghz5 = 0x0006, .ghz2 = 0x0006, NOUPLOAD, }, 1582 [B2056_SYN_PLL_LOOPFILTER4] = { .ghz5 = 0x002b, .ghz2 = 0x002b, UPLOAD, },
1583 [B2056_SYN_PLL_LOOPFILTER5] = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, }, 1583 [B2056_SYN_PLL_LOOPFILTER5] = { .ghz5 = 0x0001, .ghz2 = 0x0001, NOUPLOAD, },
1584 [B2056_SYN_PLL_MMD1] = { .ghz5 = 0x001c, .ghz2 = 0x001c, NOUPLOAD, }, 1584 [B2056_SYN_PLL_MMD1] = { .ghz5 = 0x001c, .ghz2 = 0x001c, NOUPLOAD, },
1585 [B2056_SYN_PLL_MMD2] = { .ghz5 = 0x0002, .ghz2 = 0x0002, NOUPLOAD, }, 1585 [B2056_SYN_PLL_MMD2] = { .ghz5 = 0x0002, .ghz2 = 0x0002, NOUPLOAD, },