diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2014-04-20 13:05:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-22 15:06:33 -0400 |
| commit | a6aa05d6e945d29855aec7bb653a99ff7adc674a (patch) | |
| tree | a2d02182ead3b34f363c116fae64202303b59b78 /drivers/net/wireless | |
| parent | bc36e994a2ea97a28465db1c77d9f99bc8e38697 (diff) | |
| download | blackbird-op-linux-a6aa05d6e945d29855aec7bb653a99ff7adc674a.tar.gz blackbird-op-linux-a6aa05d6e945d29855aec7bb653a99ff7adc674a.zip | |
b43: N-PHY: implement reading support for radio 0x2057
Bit 0x200 has been noticed in the following log:
radio_read(0x02ca) -> 0x0000
radio_write(0x00ca) <- 0x0080
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/b43/phy_n.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index cbeb299ec0da..3d13e73520f8 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c @@ -5522,8 +5522,11 @@ static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg) { /* Register 1 is a 32-bit register. */ B43_WARN_ON(reg == 1); - /* N-PHY needs 0x100 for read access */ - reg |= 0x100; + + if (dev->phy.rev >= 7) + reg |= 0x200; /* Radio 0x2057 */ + else + reg |= 0x100; b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg); return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW); |
