From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 29 Feb 2012 19:53:21 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: v3.4-rc1~177^2~108^2~205
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8701ff0a88bcfc8c7dced3842919ad8d016a6835;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
---

8701ff0a88bcfc8c7dced3842919ad8d016a6835
diff --cc drivers/net/wireless/ath/ath9k/ar9002_hw.c
index d48f5fe,d190411..e3f2689
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@@ -128,19 -171,34 +128,38 @@@ static void ar9002_hw_init_mode_regs(st
  			       ARRAY_SIZE(ar5416Bank2), 2);
  		INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3,
  			       ARRAY_SIZE(ar5416Bank3), 3);
 -		INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6,
 -			       ARRAY_SIZE(ar5416Bank6), 3);
 -		INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC,
 -			       ARRAY_SIZE(ar5416Bank6TPC), 3);
  		INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7,
  			       ARRAY_SIZE(ar5416Bank7), 2);
 -		INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac,
 -			       ARRAY_SIZE(ar5416Addac), 2);
 +
 +		/* Common for AR5416, AR9160 */
 +		if (!AR_SREV_9100(ah))
 +			INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6,
 +				       ARRAY_SIZE(ar5416Bank6), 3);
 +
 +		/* Common for AR913x, AR9160 */
 +		if (!AR_SREV_5416(ah))
 +			INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC_9100,
 +				       ARRAY_SIZE(ar5416Bank6TPC_9100), 3);
  	}
+ 
+ 	/* iniAddac needs to be modified for these chips */
+ 	if (AR_SREV_9160(ah) || !AR_SREV_5416_22_OR_LATER(ah)) {
+ 		struct ar5416IniArray *addac = &ah->iniAddac;
+ 		u32 size = sizeof(u32) * addac->ia_rows * addac->ia_columns;
+ 		u32 *data;
+ 
+ 		data = kmalloc(size, GFP_KERNEL);
+ 		if (!data)
+ 			return;
+ 
+ 		memcpy(data, addac->ia_array, size);
+ 		addac->ia_array = data;
+ 
+ 		if (!AR_SREV_5416_22_OR_LATER(ah)) {
+ 			/* override CLKDRV value */
+ 			INI_RA(addac, 31,1) = 0;
+ 		}
+ 	}
  }
  
  /* Support for Japan ch.14 (2484) spread */