aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vasanth@atheros.com>2009-09-09 15:25:52 +0530
committerJohn W. Linville <linville@tuxdriver.com>2009-09-09 11:25:27 -0400
commit8c8f9ba7051b017e44124666b41c1dc70333a77c (patch)
tree89f516d0c9b3dfce4cc801def40a1cb0093ee403
parentf42cc2c2909f24faa1381ae139067edeba8c796d (diff)
ath9k: Initialize the priority gpio for BT coex 3-wire
Oops, a stupid mistake in the original patch which adds coex 3-wire support. Bluetooth priority gpio needs to be gpio 7. Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/btcoex.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/btcoex.h b/drivers/net/wireless/ath/ath9k/btcoex.h
index f1baf66e2ec..297b027fd3c 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -19,6 +19,7 @@
#define ATH_WLANACTIVE_GPIO 5
#define ATH_BTACTIVE_GPIO 6
+#define ATH_BTPRIORITY_GPIO 7
#define ATH_BTCOEX_DEF_BT_PERIOD 45
#define ATH_BTCOEX_DEF_DUTY_CYCLE 55
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index c39693ba06a..b6c6cca0781 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -3691,10 +3691,12 @@ void ath9k_hw_fill_cap_info(struct ath_hw *ah)
btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;
btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
- if (AR_SREV_9285(ah))
+ if (AR_SREV_9285(ah)) {
btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE;
- else
+ btcoex_info->btpriority_gpio = ATH_BTPRIORITY_GPIO;
+ } else {
btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
+ }
} else {
btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
}