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

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

b43: set TMS to work with current band width for N-PHY 



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

drivers/net/wireless/b43/main.c

+6 −0
Original line number Diff line number Diff line
@@ -1150,6 +1150,12 @@ void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags) 


	flags |= B43_TMSLOW_PHYCLKEN;

	flags |= B43_TMSLOW_PHYRESET;

	if (dev->phy.type == B43_PHYTYPE_N) {

		if (b43_channel_type_is_40mhz(dev->phy.channel_type))

			flags |= B43_TMSLOW_PHYCLKSPEED_160MHZ;

		else

			flags |= B43_TMSLOW_PHYCLKSPEED_80MHZ;

	}

	ssb_device_enable(dev->dev, flags);

	msleep(2);		/* Wait for the PLL to turn on. */

drivers/net/wireless/b43/phy_common.c

+7 −0
Original line number Diff line number Diff line
@@ -429,6 +429,13 @@ void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on) 
	b43_write16(dev, B43_MMIO_PHY0, on ? 0 : 0xF4);

}





bool b43_channel_type_is_40mhz(enum nl80211_channel_type channel_type)

{

	return (channel_type == NL80211_CHAN_HT40MINUS ||

		channel_type == NL80211_CHAN_HT40PLUS);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/Cordic */

struct b43_c32 b43_cordic(int theta)

{

drivers/net/wireless/b43/phy_common.h

+2 −0
Original line number Diff line number Diff line
@@ -436,6 +436,8 @@ int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset); 
 */

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



bool b43_channel_type_is_40mhz(enum nl80211_channel_type channel_type);



struct b43_c32 b43_cordic(int theta);



#endif /* LINUX_B43_PHY_COMMON_H_ */

drivers/net/wireless/b43/phy_n.c

+0 −7
Original line number Diff line number Diff line
@@ -88,13 +88,6 @@ static void b43_nphy_rf_control_override(struct b43_wldev *dev, u16 field, 
static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,

						u16 value, u8 core);



static inline bool b43_channel_type_is_40mhz(

					enum nl80211_channel_type channel_type)

{

	return (channel_type == NL80211_CHAN_HT40MINUS ||

		channel_type == NL80211_CHAN_HT40PLUS);

}



void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)

{//TODO

}