Browse Source

b43: N-PHY: drop reg 0x1 access restriction on new PHY revs

Initialization of N-PHY radio revs 5 and 7 requires writing to 0x1.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Rafał Miłecki 11 years ago
parent
commit
0933ecf9ab
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/net/wireless/b43/phy_n.c

+ 2 - 2
drivers/net/wireless/b43/phy_n.c

@@ -5834,7 +5834,7 @@ static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
 static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
 static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
 {
 {
 	/* Register 1 is a 32-bit register. */
 	/* Register 1 is a 32-bit register. */
-	B43_WARN_ON(reg == 1);
+	B43_WARN_ON(dev->phy.rev < 7 && reg == 1);
 
 
 	if (dev->phy.rev >= 7)
 	if (dev->phy.rev >= 7)
 		reg |= 0x200; /* Radio 0x2057 */
 		reg |= 0x200; /* Radio 0x2057 */
@@ -5848,7 +5848,7 @@ static u16 b43_nphy_op_radio_read(struct b43_wldev *dev, u16 reg)
 static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 {
 {
 	/* Register 1 is a 32-bit register. */
 	/* Register 1 is a 32-bit register. */
-	B43_WARN_ON(reg == 1);
+	B43_WARN_ON(dev->phy.rev < 7 && reg == 1);
 
 
 	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
 	b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
 	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);
 	b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);