Commit cb24f57f authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Move Analog switching into phy code 



This moves the Analog switching code into the PHY files.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2b80848e

drivers/net/wireless/b43/main.c

+3 −20
Original line number Diff line number Diff line
@@ -1052,23 +1052,6 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) 
	}

}



/* Turn the Analog ON/OFF */

static void b43_switch_analog(struct b43_wldev *dev, int on)

{

	switch (dev->phy.type) {

	case B43_PHYTYPE_A:

	case B43_PHYTYPE_G:

		b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);

		break;

	case B43_PHYTYPE_N:

		b43_phy_write(dev, B43_NPHY_AFECTL_OVER,

			      on ? 0 : 0x7FFF);

		break;

	default:

		B43_WARN_ON(1);

	}

}



void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags)

{

	u32 tmslow;
@@ -1096,7 +1079,7 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) 
	 * PHY-type, yet. wireless_core_reset will be called once again later,

	 * when we know the PHY-type. */

	if (dev->phy.ops)

		b43_switch_analog(dev, 1);

		dev->phy.ops->switch_analog(dev, 1);



	macctl = b43_read32(dev, B43_MMIO_MACCTL);

	macctl &= ~B43_MACCTL_GMODE;
@@ -3952,7 +3935,7 @@ static void b43_wireless_core_exit(struct b43_wldev *dev) 
	b43_dma_free(dev);

	b43_pio_free(dev);

	b43_chip_exit(dev);

	b43_switch_analog(dev, 0);

	dev->phy.ops->switch_analog(dev, 0);

	if (dev->wl->current_beacon) {

		dev_kfree_skb_any(dev->wl->current_beacon);

		dev->wl->current_beacon = NULL;
@@ -4437,7 +4420,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) 
		wl->current_dev = dev;

	INIT_WORK(&dev->restart_work, b43_chip_reset);



	b43_switch_analog(dev, 0);

	dev->phy.ops->switch_analog(dev, 0);

	ssb_device_disable(dev->dev, 0);

	ssb_bus_may_powerdown(bus);

drivers/net/wireless/b43/phy_a.c

+1 −0
Original line number Diff line number Diff line
@@ -632,6 +632,7 @@ const struct b43_phy_operations b43_phyops_a = { 
	.radio_write		= b43_aphy_op_radio_write,

	.supports_hwpctl	= b43_aphy_op_supports_hwpctl,

	.software_rfkill	= b43_aphy_op_software_rfkill,

	.switch_analog		= b43_phyop_switch_analog_generic,

	.switch_channel		= b43_aphy_op_switch_channel,

	.get_default_chan	= b43_aphy_op_get_default_chan,

	.set_rx_antenna		= b43_aphy_op_set_rx_antenna,

drivers/net/wireless/b43/phy_common.c

+5 −0
Original line number Diff line number Diff line
@@ -374,3 +374,8 @@ int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset) 


	return average;

}



void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on)

{

	b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);

}

drivers/net/wireless/b43/phy_common.h

+12 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ enum b43_txpwr_result { 
 * 			RFKILL_STATE_SOFT_BLOCKED or

 * 			RFKILL_STATE_UNBLOCKED

 * 			Must not be NULL.

 * @switch_analog:	Turn the Analog on/off.

 * 			Must not be NULL.

 * @switch_channel:	Switch the radio to another channel.

 * 			Must not be NULL.

 * @get_default_chan:	Just returns the default channel number.
@@ -158,6 +160,7 @@ struct b43_phy_operations { 
	/* Radio */

	bool (*supports_hwpctl)(struct b43_wldev *dev);

	void (*software_rfkill)(struct b43_wldev *dev, enum rfkill_state state);

	void (*switch_analog)(struct b43_wldev *dev, bool on);

	int (*switch_channel)(struct b43_wldev *dev, unsigned int new_channel);

	unsigned int (*get_default_chan)(struct b43_wldev *dev);

	void (*set_rx_antenna)(struct b43_wldev *dev, int antenna);
@@ -397,5 +400,14 @@ void b43_phy_txpower_adjust_work(struct work_struct *work); 
 */

int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset);



/**

 * b43_phy_switch_analog_generic - Generic PHY operation for switching the Analog.

 *

 * It does the switching based on the PHY0 core register.

 * Do _not_ call this directly. Only use it as a switch_analog callback

 * for struct b43_phy_operations.

 */

void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on);





#endif /* LINUX_B43_PHY_COMMON_H_ */

drivers/net/wireless/b43/phy_g.c

+1 −0
Original line number Diff line number Diff line
@@ -3271,6 +3271,7 @@ const struct b43_phy_operations b43_phyops_g = { 
	.radio_write		= b43_gphy_op_radio_write,

	.supports_hwpctl	= b43_gphy_op_supports_hwpctl,

	.software_rfkill	= b43_gphy_op_software_rfkill,

	.switch_analog		= b43_phyop_switch_analog_generic,

	.switch_channel		= b43_gphy_op_switch_channel,

	.get_default_chan	= b43_gphy_op_get_default_chan,

	.set_rx_antenna		= b43_gphy_op_set_rx_antenna,

CRA Git | Maintained and supported by SUSTech CRA and CCSE