]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
ath9k: Initialize the priority gpio for BT coex 3-wire
authorVasanthakumar Thiagarajan <vasanth@atheros.com>
Wed, 9 Sep 2009 09:55:52 +0000 (15:25 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Sep 2009 15:25:27 +0000 (11:25 -0400)
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>
drivers/net/wireless/ath/ath9k/btcoex.h
drivers/net/wireless/ath/ath9k/hw.c

index f1baf66e2ecde8b02a893d93bc41242d6c139d3d..297b027fd3c38b17f61e3ef3c8557664b99676fe 100644 (file)
@@ -19,6 +19,7 @@
 
 #define ATH_WLANACTIVE_GPIO    5
 #define ATH_BTACTIVE_GPIO      6
 
 #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
 
 #define ATH_BTCOEX_DEF_BT_PERIOD  45
 #define ATH_BTCOEX_DEF_DUTY_CYCLE 55
index c39693ba06aa17190ee19dc9c51bd239573f79cb..b6c6cca07812fd4c3c5d998787a5f7e0c4085b49 100644 (file)
@@ -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;
 
                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;
                        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;
                        btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_2WIRE;
+               }
        } else {
                btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
        }
        } else {
                btcoex_info->btcoex_scheme = ATH_BTCOEX_CFG_NONE;
        }