aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorVasanthakumar Thiagarajan <vasanth@atheros.com>2009-09-09 05:55:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-09-09 11:25:27 -0400
commit8c8f9ba7051b017e44124666b41c1dc70333a77c (patch)
tree89f516d0c9b3dfce4cc801def40a1cb0093ee403 /drivers/net
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>
Diffstat (limited to 'drivers/net')
-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 f1baf66e2ecd..297b027fd3c3 100644
--- a/drivers/net/wireless/ath/ath9k/btcoex.h
+++ b/drivers/net/wireless/ath/ath9k/btcoex.h
@@ -19,6 +19,7 @@
19 19
20#define ATH_WLANACTIVE_GPIO 5 20#define ATH_WLANACTIVE_GPIO 5
21#define ATH_BTACTIVE_GPIO 6 21#define ATH_BTACTIVE_GPIO 6
22#define ATH_BTPRIORITY_GPIO 7
22 23
23#define ATH_BTCOEX_DEF_BT_PERIOD 45 24#define ATH_BTCOEX_DEF_BT_PERIOD 45
24#define ATH_BTCOEX_DEF_DUTY_CYCLE 55 25#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 c39693ba06aa..b6c6cca07812 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)
3691 btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO; 3691 btcoex_info->btactive_gpio = ATH_BTACTIVE_GPIO;
3692 btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO; 3692 btcoex_info->wlanactive_gpio = ATH_WLANACTIVE_GPIO;
3693 3693
3694 if (AR_SREV_9285(ah)) 3694 if (AR_SREV_9285(ah)) {
3695 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE; 3695 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_3WIRE;
3696 else 3696 btcoex_info->btpriority_gpio = ATH_BTPRIORITY_GPIO;
3697 } else {
3697 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE; 3698 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
3699 }
3698 } else { 3700 } else {
3699 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE; 3701 btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
3700 } 3702 }