Commit 755fd183 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

b43: N-PHY: implement own maskset

This let us avoid double addressing while still having reg check.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f00fe7f6
...@@ -3705,6 +3705,15 @@ static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value) ...@@ -3705,6 +3705,15 @@ static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)
b43_write16(dev, B43_MMIO_PHY_DATA, value); b43_write16(dev, B43_MMIO_PHY_DATA, value);
} }
static void b43_nphy_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
u16 set)
{
check_phyreg(dev, reg);
b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
b43_write16(dev, B43_MMIO_PHY_DATA,
(b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
}
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. */
...@@ -3799,6 +3808,7 @@ const struct b43_phy_operations b43_phyops_n = { ...@@ -3799,6 +3808,7 @@ const struct b43_phy_operations b43_phyops_n = {
.init = b43_nphy_op_init, .init = b43_nphy_op_init,
.phy_read = b43_nphy_op_read, .phy_read = b43_nphy_op_read,
.phy_write = b43_nphy_op_write, .phy_write = b43_nphy_op_write,
.phy_maskset = b43_nphy_op_maskset,
.radio_read = b43_nphy_op_radio_read, .radio_read = b43_nphy_op_radio_read,
.radio_write = b43_nphy_op_radio_write, .radio_write = b43_nphy_op_radio_write,
.software_rfkill = b43_nphy_op_software_rfkill, .software_rfkill = b43_nphy_op_software_rfkill,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment