diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-12-09 14:56:00 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:23:29 -0500 |
| commit | d242b90adf4e1918ac86433dfbb32a1136515bdd (patch) | |
| tree | 86cf9d7087f5044de716b93bcb460ec21bcff185 /drivers/net/wireless/b43/phy_n.c | |
| parent | ea85ffd627b5da346b348d784fafec0ce4632d4d (diff) | |
b43: N-PHY: use designed function and macro for writing tables
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43/phy_n.c')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index e12f399f761..a1aa5700b63 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
| @@ -1209,29 +1209,18 @@ static void b43_nphy_workarounds(struct b43_wldev *dev) | |||
| 1209 | b43_radio_set(dev, B2055_C2_TX_RF_SPARE, 0x8); | 1209 | b43_radio_set(dev, B2055_C2_TX_RF_SPARE, 0x8); |
| 1210 | } | 1210 | } |
| 1211 | 1211 | ||
| 1212 | /* TODO: convert to b43_ntab_write? */ | 1212 | b43_ntab_write(dev, B43_NTAB16(8, 0x00), 0x000A); |
| 1213 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2000); | 1213 | b43_ntab_write(dev, B43_NTAB16(8, 0x10), 0x000A); |
| 1214 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x000A); | 1214 | b43_ntab_write(dev, B43_NTAB16(8, 0x02), 0xCDAA); |
| 1215 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2010); | 1215 | b43_ntab_write(dev, B43_NTAB16(8, 0x12), 0xCDAA); |
| 1216 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x000A); | ||
| 1217 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2002); | ||
| 1218 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0xCDAA); | ||
| 1219 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2012); | ||
| 1220 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0xCDAA); | ||
| 1221 | 1216 | ||
| 1222 | if (dev->phy.rev < 2) { | 1217 | if (dev->phy.rev < 2) { |
| 1223 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2008); | 1218 | b43_ntab_write(dev, B43_NTAB16(8, 0x08), 0x0000); |
| 1224 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0000); | 1219 | b43_ntab_write(dev, B43_NTAB16(8, 0x18), 0x0000); |
| 1225 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2018); | 1220 | b43_ntab_write(dev, B43_NTAB16(8, 0x07), 0x7AAB); |
| 1226 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0000); | 1221 | b43_ntab_write(dev, B43_NTAB16(8, 0x17), 0x7AAB); |
| 1227 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2007); | 1222 | b43_ntab_write(dev, B43_NTAB16(8, 0x06), 0x0800); |
| 1228 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x7AAB); | 1223 | b43_ntab_write(dev, B43_NTAB16(8, 0x16), 0x0800); |
| 1229 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2017); | ||
| 1230 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x7AAB); | ||
| 1231 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2006); | ||
| 1232 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0800); | ||
| 1233 | b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x2016); | ||
| 1234 | b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x0800); | ||
| 1235 | } | 1224 | } |
| 1236 | 1225 | ||
| 1237 | b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8); | 1226 | b43_phy_write(dev, B43_NPHY_RFCTL_LUT_TRSW_LO1, 0x2D8); |