From: Rafał Miłecki <zajec5@gmail.com>
Date: Sun, 20 Apr 2014 11:05:46 +0000 (+0200)
Subject: b43: N-PHY: implement reading support for radio 0x2057
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6aa05d6e945d29855aec7bb653a99ff7adc674a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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>
---

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);