Commit 7acd7187 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 68c6beb3 3b1bace9

drivers/net/wireless/ath/ath9k/ar9003_phy.c

+50 −0
Original line number Diff line number Diff line
@@ -701,6 +701,54 @@ static int ar9550_hw_get_modes_txgain_index(struct ath_hw *ah, 
	return ret;

}



static void ar9003_doubler_fix(struct ath_hw *ah)

{

	if (AR_SREV_9300(ah) || AR_SREV_9580(ah) || AR_SREV_9550(ah)) {

		REG_RMW(ah, AR_PHY_65NM_CH0_RXTX2,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S, 0);

		REG_RMW(ah, AR_PHY_65NM_CH1_RXTX2,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S, 0);

		REG_RMW(ah, AR_PHY_65NM_CH2_RXTX2,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S, 0);



		udelay(200);



		REG_CLR_BIT(ah, AR_PHY_65NM_CH0_RXTX2,

			    AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK);

		REG_CLR_BIT(ah, AR_PHY_65NM_CH1_RXTX2,

			    AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK);

		REG_CLR_BIT(ah, AR_PHY_65NM_CH2_RXTX2,

			    AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK);



		udelay(1);



		REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_RXTX2,

			      AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK, 1);

		REG_RMW_FIELD(ah, AR_PHY_65NM_CH1_RXTX2,

			      AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK, 1);

		REG_RMW_FIELD(ah, AR_PHY_65NM_CH2_RXTX2,

			      AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK, 1);



		udelay(200);



		REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_SYNTH12,

			      AR_PHY_65NM_CH0_SYNTH12_VREFMUL3, 0xf);



		REG_RMW(ah, AR_PHY_65NM_CH0_RXTX2, 0,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S);

		REG_RMW(ah, AR_PHY_65NM_CH1_RXTX2, 0,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S);

		REG_RMW(ah, AR_PHY_65NM_CH2_RXTX2, 0,

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S |

			1 << AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S);

	}

}



static int ar9003_hw_process_ini(struct ath_hw *ah,

				 struct ath9k_channel *chan)

{
@@ -726,6 +774,8 @@ static int ar9003_hw_process_ini(struct ath_hw *ah, 
					   modesIndex);

	}



	ar9003_doubler_fix(ah);



	/*

	 * RXGAIN initvals.

	 */

drivers/net/wireless/ath/ath9k/ar9003_phy.h

+11 −0
Original line number Diff line number Diff line
@@ -656,13 +656,24 @@ 
#define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x00000001 : 0x00000002)

#define AR_PHY_SYNTH4_LONG_SHIFT_SELECT_S ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0 : 1)

#define AR_PHY_65NM_CH0_SYNTH7      0x16098

#define AR_PHY_65NM_CH0_SYNTH12     0x160ac

#define AR_PHY_65NM_CH0_BIAS1       0x160c0

#define AR_PHY_65NM_CH0_BIAS2       0x160c4

#define AR_PHY_65NM_CH0_BIAS4       0x160cc

#define AR_PHY_65NM_CH0_RXTX2       0x16104

#define AR_PHY_65NM_CH1_RXTX2       0x16504

#define AR_PHY_65NM_CH2_RXTX2       0x16904

#define AR_PHY_65NM_CH0_RXTX4       0x1610c

#define AR_PHY_65NM_CH1_RXTX4       0x1650c

#define AR_PHY_65NM_CH2_RXTX4       0x1690c



#define AR_PHY_65NM_CH0_SYNTH12_VREFMUL3           0x00780000

#define AR_PHY_65NM_CH0_SYNTH12_VREFMUL3_S         19

#define AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK         0x00000004

#define AR_PHY_65NM_CH0_RXTX2_SYNTHON_MASK_S       2

#define AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK        0x00000008

#define AR_PHY_65NM_CH0_RXTX2_SYNTHOVR_MASK_S      3



#define AR_CH0_TOP	(AR_SREV_9300(ah) ? 0x16288 : \

			 (((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x1628c : 0x16280)))

#define AR_CH0_TOP_XPABIASLVL (AR_SREV_9550(ah) ? 0x3c0 : 0x300)

drivers/net/wireless/ath/ath9k/ar9462_2p1_initvals.h

+3 −3
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static const u32 ar9462_2p1_baseband_postamble[][5] = { 
	{0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3236605e, 0x32365a5e},

	{0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},

	{0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},

	{0x00009e20, 0x000003a5, 0x000003a5, 0x000003a5, 0x000003a5},

	{0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},

	{0x00009e3c, 0xcf946220, 0xcf946220, 0xcfd5c782, 0xcfd5c282},

	{0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
@@ -400,7 +400,7 @@ static const u32 ar9462_2p1_baseband_postamble[][5] = { 
	{0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x00100000},

	{0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},

	{0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},

	{0x0000ae20, 0x000001a6, 0x000001a6, 0x000001aa, 0x000001aa},

	{0x0000b284, 0x00000000, 0x00000000, 0x00000550, 0x00000550},

};
@@ -472,7 +472,7 @@ static const u32 ar9462_2p1_radio_postamble[][5] = { 


static const u32 ar9462_2p1_soc_preamble[][2] = {

	/* Addr      allmodes  */

	{0x000040a4, 0x00a0c1c9},

	{0x000040a4, 0x00a0c9c9},

	{0x00007020, 0x00000000},

	{0x00007034, 0x00000002},

	{0x00007038, 0x000004c2},

drivers/net/wireless/ath/regd.c

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,8 @@ static int __ath_reg_dyn_country(struct wiphy *wiphy, 
{

	u16 country_code;



	if (!ath_is_world_regd(reg))

	if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&

	    !ath_is_world_regd(reg))

		return -EINVAL;



	country_code = ath_regd_find_country_by_name(request->alpha2);

drivers/net/wireless/brcm80211/brcmfmac/p2p.c

+1 −0
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg, 
		}

		err = brcmf_p2p_escan(p2p, num_nodfs, chanspecs, search_state,

				      action, P2PAPI_BSSCFG_DEVICE);

		kfree(chanspecs);

	}

exit:

	if (err)