Commit a0f68763 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 3fdcbd45 7b21aea0

drivers/net/wireless/ath/ath5k/base.c

+19 −0
Original line number Diff line number Diff line
@@ -2415,6 +2415,22 @@ ath5k_tx_complete_poll_work(struct work_struct *work) 
* Initialization routines *

\*************************/



static const struct ieee80211_iface_limit if_limits[] = {

	{ .max = 2048,	.types = BIT(NL80211_IFTYPE_STATION) },

	{ .max = 4,	.types =

#ifdef CONFIG_MAC80211_MESH

				 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

				 BIT(NL80211_IFTYPE_AP) },

};



static const struct ieee80211_iface_combination if_comb = {

	.limits = if_limits,

	.n_limits = ARRAY_SIZE(if_limits),

	.max_interfaces = 2048,

	.num_different_channels = 1,

};



int __devinit

ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops)

{
@@ -2436,6 +2452,9 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) 
		BIT(NL80211_IFTYPE_ADHOC) |

		BIT(NL80211_IFTYPE_MESH_POINT);



	hw->wiphy->iface_combinations = &if_comb;

	hw->wiphy->n_iface_combinations = 1;



	/* SW support for IBSS_RSN is provided by mac80211 */

	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

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

+1 −1
Original line number Diff line number Diff line
@@ -3809,7 +3809,7 @@ static bool is_pmu_set(struct ath_hw *ah, u32 pmu_reg, int pmu_set) 
	return true;

}



static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)

void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)

{

	int internal_regulator =

		ath9k_hw_ar9300_get_eeprom(ah, EEP_INTERNAL_REGULATOR);

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

+3 −0
Original line number Diff line number Diff line
@@ -334,4 +334,7 @@ u8 *ar9003_get_spur_chan_ptr(struct ath_hw *ah, bool is_2ghz); 


unsigned int ar9003_get_paprd_scale_factor(struct ath_hw *ah,

					   struct ath9k_channel *chan);



void ar9003_hw_internal_regulator_apply(struct ath_hw *ah);



#endif

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

+90 −88
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011 Atheros Communications Inc.

 * Copyright (c) 2010-2011 Atheros Communications Inc.

 * Copyright (c) 2011-2012 Qualcomm Atheros Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -27,10 +28,10 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = { 
	{0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},

	{0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},

	{0x00009e00, 0x0372161e, 0x0372161e, 0x037216a4, 0x037216a4},

	{0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},

	{0x00009e04, 0x00202020, 0x00202020, 0x00202020, 0x00202020},

	{0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},

	{0x00009e10, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e},

	{0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},

	{0x00009e14, 0x31365d5e, 0x3136605e, 0x3136605e, 0x31365d5e},

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

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

	{0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
@@ -55,7 +56,7 @@ static const u32 ar9331_1p1_baseband_postamble[][5] = { 
	{0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},

	{0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071981},

	{0x0000a2d0, 0x00071982, 0x00071982, 0x00071982, 0x00071982},

	{0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},

	{0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},

	{0x0000ae04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
@@ -377,14 +378,14 @@ static const u32 ar9331_1p1_radio_core[][2] = { 
	{0x000160b4, 0x92480040},

	{0x000160c0, 0x006db6db},

	{0x000160c4, 0x0186db60},

	{0x000160c8, 0x6db6db6c},

	{0x000160c8, 0x6db4db6c},

	{0x000160cc, 0x6de6c300},

	{0x000160d0, 0x14500820},

	{0x00016100, 0x04cb0001},

	{0x00016104, 0xfff80015},

	{0x00016108, 0x00080010},

	{0x0001610c, 0x00170000},

	{0x00016140, 0x10804000},

	{0x00016140, 0x10800000},

	{0x00016144, 0x01884080},

	{0x00016148, 0x000080c0},

	{0x00016280, 0x01000015},
@@ -973,26 +974,27 @@ static const u32 ar9331_1p1_mac_core[][2] = { 


static const u32 ar9331_common_rx_gain_1p1[][2] = {

	/* Addr      allmodes  */

	{0x0000a000, 0x00010000},

	{0x0000a004, 0x00030002},

	{0x0000a008, 0x00050004},

	{0x0000a00c, 0x00810080},

	{0x0000a010, 0x00830082},

	{0x0000a014, 0x01810180},

	{0x0000a018, 0x01830182},

	{0x0000a01c, 0x01850184},

	{0x0000a020, 0x01890188},

	{0x0000a024, 0x018b018a},

	{0x0000a028, 0x018d018c},

	{0x0000a02c, 0x01910190},

	{0x0000a030, 0x01930192},

	{0x0000a034, 0x01950194},

	{0x0000a038, 0x038a0196},

	{0x0000a03c, 0x038c038b},

	{0x0000a040, 0x0390038d},

	{0x0000a044, 0x03920391},

	{0x0000a048, 0x03940393},

	{0x0000a04c, 0x03960395},

	{0x00009e18, 0x05000000},

	{0x0000a000, 0x00060005},

	{0x0000a004, 0x00810080},

	{0x0000a008, 0x00830082},

	{0x0000a00c, 0x00850084},

	{0x0000a010, 0x01820181},

	{0x0000a014, 0x01840183},

	{0x0000a018, 0x01880185},

	{0x0000a01c, 0x018a0189},

	{0x0000a020, 0x02850284},

	{0x0000a024, 0x02890288},

	{0x0000a028, 0x028b028a},

	{0x0000a02c, 0x03850384},

	{0x0000a030, 0x03890388},

	{0x0000a034, 0x038b038a},

	{0x0000a038, 0x038d038c},

	{0x0000a03c, 0x03910390},

	{0x0000a040, 0x03930392},

	{0x0000a044, 0x03950394},

	{0x0000a048, 0x00000396},

	{0x0000a04c, 0x00000000},

	{0x0000a050, 0x00000000},

	{0x0000a054, 0x00000000},

	{0x0000a058, 0x00000000},
@@ -1005,15 +1007,15 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = { 
	{0x0000a074, 0x00000000},

	{0x0000a078, 0x00000000},

	{0x0000a07c, 0x00000000},

	{0x0000a080, 0x22222229},

	{0x0000a084, 0x1d1d1d1d},

	{0x0000a088, 0x1d1d1d1d},

	{0x0000a08c, 0x1d1d1d1d},

	{0x0000a090, 0x171d1d1d},

	{0x0000a094, 0x11111717},

	{0x0000a098, 0x00030311},

	{0x0000a09c, 0x00000000},

	{0x0000a0a0, 0x00000000},

	{0x0000a080, 0x28282828},

	{0x0000a084, 0x28282828},

	{0x0000a088, 0x28282828},

	{0x0000a08c, 0x28282828},

	{0x0000a090, 0x28282828},

	{0x0000a094, 0x24242428},

	{0x0000a098, 0x171e1e1e},

	{0x0000a09c, 0x02020b0b},

	{0x0000a0a0, 0x02020202},

	{0x0000a0a4, 0x00000000},

	{0x0000a0a8, 0x00000000},

	{0x0000a0ac, 0x00000000},
@@ -1021,27 +1023,27 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = { 
	{0x0000a0b4, 0x00000000},

	{0x0000a0b8, 0x00000000},

	{0x0000a0bc, 0x00000000},

	{0x0000a0c0, 0x001f0000},

	{0x0000a0c4, 0x01000101},

	{0x0000a0c8, 0x011e011f},

	{0x0000a0cc, 0x011c011d},

	{0x0000a0d0, 0x02030204},

	{0x0000a0d4, 0x02010202},

	{0x0000a0d8, 0x021f0200},

	{0x0000a0dc, 0x0302021e},

	{0x0000a0e0, 0x03000301},

	{0x0000a0e4, 0x031e031f},

	{0x0000a0e8, 0x0402031d},

	{0x0000a0ec, 0x04000401},

	{0x0000a0f0, 0x041e041f},

	{0x0000a0f4, 0x0502041d},

	{0x0000a0f8, 0x05000501},

	{0x0000a0fc, 0x051e051f},

	{0x0000a100, 0x06010602},

	{0x0000a104, 0x061f0600},

	{0x0000a108, 0x061d061e},

	{0x0000a10c, 0x07020703},

	{0x0000a110, 0x07000701},

	{0x0000a0c0, 0x22072208},

	{0x0000a0c4, 0x22052206},

	{0x0000a0c8, 0x22032204},

	{0x0000a0cc, 0x22012202},

	{0x0000a0d0, 0x221f2200},

	{0x0000a0d4, 0x221d221e},

	{0x0000a0d8, 0x33023303},

	{0x0000a0dc, 0x33003301},

	{0x0000a0e0, 0x331e331f},

	{0x0000a0e4, 0x4402331d},

	{0x0000a0e8, 0x44004401},

	{0x0000a0ec, 0x441e441f},

	{0x0000a0f0, 0x55025503},

	{0x0000a0f4, 0x55005501},

	{0x0000a0f8, 0x551e551f},

	{0x0000a0fc, 0x6602551d},

	{0x0000a100, 0x66006601},

	{0x0000a104, 0x661e661f},

	{0x0000a108, 0x7703661d},

	{0x0000a10c, 0x77017702},

	{0x0000a110, 0x00007700},

	{0x0000a114, 0x00000000},

	{0x0000a118, 0x00000000},

	{0x0000a11c, 0x00000000},
@@ -1054,26 +1056,26 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = { 
	{0x0000a138, 0x00000000},

	{0x0000a13c, 0x00000000},

	{0x0000a140, 0x001f0000},

	{0x0000a144, 0x01000101},

	{0x0000a148, 0x011e011f},

	{0x0000a14c, 0x011c011d},

	{0x0000a150, 0x02030204},

	{0x0000a154, 0x02010202},

	{0x0000a158, 0x021f0200},

	{0x0000a15c, 0x0302021e},

	{0x0000a160, 0x03000301},

	{0x0000a164, 0x031e031f},

	{0x0000a168, 0x0402031d},

	{0x0000a16c, 0x04000401},

	{0x0000a170, 0x041e041f},

	{0x0000a174, 0x0502041d},

	{0x0000a178, 0x05000501},

	{0x0000a17c, 0x051e051f},

	{0x0000a180, 0x06010602},

	{0x0000a184, 0x061f0600},

	{0x0000a188, 0x061d061e},

	{0x0000a18c, 0x07020703},

	{0x0000a190, 0x07000701},

	{0x0000a144, 0x111f1100},

	{0x0000a148, 0x111d111e},

	{0x0000a14c, 0x111b111c},

	{0x0000a150, 0x22032204},

	{0x0000a154, 0x22012202},

	{0x0000a158, 0x221f2200},

	{0x0000a15c, 0x221d221e},

	{0x0000a160, 0x33013302},

	{0x0000a164, 0x331f3300},

	{0x0000a168, 0x4402331e},

	{0x0000a16c, 0x44004401},

	{0x0000a170, 0x441e441f},

	{0x0000a174, 0x55015502},

	{0x0000a178, 0x551f5500},

	{0x0000a17c, 0x6602551e},

	{0x0000a180, 0x66006601},

	{0x0000a184, 0x661e661f},

	{0x0000a188, 0x7703661d},

	{0x0000a18c, 0x77017702},

	{0x0000a190, 0x00007700},

	{0x0000a194, 0x00000000},

	{0x0000a198, 0x00000000},

	{0x0000a19c, 0x00000000},
@@ -1100,14 +1102,14 @@ static const u32 ar9331_common_rx_gain_1p1[][2] = { 
	{0x0000a1f0, 0x00000396},

	{0x0000a1f4, 0x00000396},

	{0x0000a1f8, 0x00000396},

	{0x0000a1fc, 0x00000196},

	{0x0000a1fc, 0x00000296},

};



static const u32 ar9331_common_tx_gain_offset1_1[][1] = {

	{0},

	{3},

	{0},

	{0},

	{0x00000000},

	{0x00000003},

	{0x00000000},

	{0x00000000},

};



static const u32 ar9331_1p1_chansel_xtal_25M[] = {

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

+3 −0
Original line number Diff line number Diff line
@@ -1468,6 +1468,9 @@ static bool ath9k_hw_chip_reset(struct ath_hw *ah, 
		return false;



	ah->chip_fullsleep = false;



	if (AR_SREV_9330(ah))

		ar9003_hw_internal_regulator_apply(ah);

	ath9k_hw_init_pll(ah, chan);

	ath9k_hw_set_rfmode(ah, chan);