lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43: LP-PHY: Two small spec updates

Browse Source 
The specs are beginning to support rev3 LP-PHYs - implement one of
the changes needed for rev3 support.
Also, in the new MIPS driver, the "Japan TX filter" was renamed to
"analog TX filter init" - however, calling it "init" is confusing,
so name it "set analog filter", with a comment for easier future
identification.

Signed-off-by: Gábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Gábor Stefanik
2009-08-18 22:08:31 +02:00
committed by John W. Linville
parent d904dc1749
commit 5791ce18aa
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/wireless/b43/phy_lp.c
View File

@@ -609,9 +609,14 @@ static void lpphy_2063_init(struct b43_wldev *dev)
b43_radio_write(dev, B2063_PA_SP7, 0); b43_radio_write(dev, B2063_PA_SP7, 0);
b43_radio_write(dev, B2063_TX_RF_SP6, 0x20); b43_radio_write(dev, B2063_TX_RF_SP6, 0x20);
b43_radio_write(dev, B2063_TX_RF_SP9, 0x40); b43_radio_write(dev, B2063_TX_RF_SP9, 0x40);
b43_radio_write(dev, B2063_PA_SP3, 0xa0); if (dev->phy.rev == 2) {
b43_radio_write(dev, B2063_PA_SP4, 0xa0); b43_radio_write(dev, B2063_PA_SP3, 0xa0);
b43_radio_write(dev, B2063_PA_SP2, 0x18); b43_radio_write(dev, B2063_PA_SP4, 0xa0);
b43_radio_write(dev, B2063_PA_SP2, 0x18);
} else {
b43_radio_write(dev, B2063_PA_SP3, 0x20);
b43_radio_write(dev, B2063_PA_SP2, 0x20);
}
} }
struct lpphy_stx_table_entry { struct lpphy_stx_table_entry {
@@ -1972,7 +1977,9 @@ static int lpphy_b2062_tune(struct b43_wldev *dev,
return err; return err;
} }
static void lpphy_japan_filter(struct b43_wldev *dev, int channel)
/* This was previously called lpphy_japan_filter */
static void lpphy_set_analog_filter(struct b43_wldev *dev, int channel)
{ {
struct b43_phy_lp *lpphy = dev->phy.lp; struct b43_phy_lp *lpphy = dev->phy.lp;
u16 tmp = (channel == 14); //SPEC FIXME check japanwidefilter! u16 tmp = (channel == 14); //SPEC FIXME check japanwidefilter!
@@ -2141,7 +2148,7 @@ static int b43_lpphy_op_switch_channel(struct b43_wldev *dev,
err = lpphy_b2062_tune(dev, new_channel); err = lpphy_b2062_tune(dev, new_channel);
if (err) if (err)
return err; return err;
lpphy_japan_filter(dev, new_channel); lpphy_set_analog_filter(dev, new_channel);
lpphy_adjust_gain_table(dev, channel2freq_lp(new_channel)); lpphy_adjust_gain_table(dev, channel2freq_lp(new_channel));
} }