Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f533d0fa authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: LCN-PHY: add R/W ops for PHY and radio 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent adb5066a

drivers/net/wireless/b43/phy_lcn.c

+40 −2
Original line number Diff line number Diff line
@@ -232,6 +232,46 @@ static void b43_phy_lcn_op_adjust_txpower(struct b43_wldev *dev) 
{

}



/**************************************************

 * R/W ops.

 **************************************************/



static u16 b43_phy_lcn_op_read(struct b43_wldev *dev, u16 reg)

{

	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);

	return b43_read16(dev, B43_MMIO_PHY_DATA);

}



static void b43_phy_lcn_op_write(struct b43_wldev *dev, u16 reg, u16 value)

{

	b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);

	b43_write16(dev, B43_MMIO_PHY_DATA, value);

}



static void b43_phy_lcn_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,

				   u16 set)

{

	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_phy_lcn_op_radio_read(struct b43_wldev *dev, u16 reg)

{

	/* LCN-PHY needs 0x200 for read access */

	reg |= 0x200;



	b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);

	return b43_read16(dev, B43_MMIO_RADIO24_DATA);

}



static void b43_phy_lcn_op_radio_write(struct b43_wldev *dev, u16 reg,

				       u16 value)

{

	b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);

	b43_write16(dev, B43_MMIO_RADIO24_DATA, value);

}



/**************************************************

 * PHY ops struct.

 **************************************************/
@@ -241,13 +281,11 @@ const struct b43_phy_operations b43_phyops_lcn = { 
	.free			= b43_phy_lcn_op_free,

	.prepare_structs	= b43_phy_lcn_op_prepare_structs,

	.init			= b43_phy_lcn_op_init,

	/*

	.phy_read		= b43_phy_lcn_op_read,

	.phy_write		= b43_phy_lcn_op_write,

	.phy_maskset		= b43_phy_lcn_op_maskset,

	.radio_read		= b43_phy_lcn_op_radio_read,

	.radio_write		= b43_phy_lcn_op_radio_write,

	*/

	.software_rfkill	= b43_phy_lcn_op_software_rfkill,

	.switch_analog		= b43_phy_lcn_op_switch_analog,

	/*