From cc1e2e34ca247c8c6134bf312244e177fa4477bb Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 3 Jul 2012 19:13:26 +0200 Subject: [PATCH] --- yaml --- r: 315263 b: refs/heads/master c: 2d00de48ff3ae1a619cda0f3dcc86cef8dfdc673 h: refs/heads/master i: 315261: 804de25bb44827232f1dfe1c74e2bba60bfdd839 315259: f21114139272ab3187b91695d08db714441af2ba 315255: 7f5fed4259edaf287ea3afe0fe806e5a2e6ddabe 315247: f10a543a92c3f2481052279864215e60d10d3e4b 315231: 99046ab7856b839cf39aabf34a4f1a05433cc49d 315199: 93800e707650df1e97c994787ab50a2fea85aaa4 315135: 58b06f4337562b8c5389a43beb6387878f579e88 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +++ trunk/drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f4d1f93e8929..ac2e283d2d00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b091727ba2253a11b6641862a5ee50a9cdc21c2 +refs/heads/master: 2d00de48ff3ae1a619cda0f3dcc86cef8dfdc673 diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 52e695508f82..57002d1ff219 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c @@ -3591,6 +3591,9 @@ static void ar9003_hw_ant_ctrl_apply(struct ath_hw *ah, bool is2ghz) if (AR_SREV_9462(ah)) { REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM, AR_SWITCH_TABLE_COM_AR9462_ALL, value); + } else if (AR_SREV_9550(ah)) { + REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM, + AR_SWITCH_TABLE_COM_AR9550_ALL, value); } else REG_RMW_FIELD(ah, AR_PHY_SWITCH_COM, AR_SWITCH_TABLE_COM_ALL, value); diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/trunk/drivers/net/wireless/ath/ath9k/ar9003_phy.h index 89907c8c7760..751c83b21493 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_phy.h +++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_phy.h @@ -650,6 +650,8 @@ #define AR_SWITCH_TABLE_COM_ALL_S (0) #define AR_SWITCH_TABLE_COM_AR9462_ALL (0xffffff) #define AR_SWITCH_TABLE_COM_AR9462_ALL_S (0) +#define AR_SWITCH_TABLE_COM_AR9550_ALL (0xffffff) +#define AR_SWITCH_TABLE_COM_AR9550_ALL_S (0) #define AR_SWITCH_TABLE_COM_SPDT (0x00f00000) #define AR_SWITCH_TABLE_COM_SPDT_ALL (0x0000fff0) #define AR_SWITCH_TABLE_COM_SPDT_ALL_S (4)