add bcm wifi 24M crystal options for AP6210.

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 6dc11f26463cfc95c69e3286b32b441b60c88a90..5d4eb1e3b4d07a4c1118046eec728a3c013f5398 100755 (executable)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -165,17 +165,21 @@ choice
 endchoice
 
 choice
-       depends on RKWIFI && WLAN_80211 && RK903
+       depends on RKWIFI && WLAN_80211
        prompt "Select the wifi module crystal freq"
        default RKWIFI_26M
 
        config RKWIFI_37_4M
        bool "37_4M"
-           depends on RKWIFI && WLAN_80211 && RK903
+           depends on RKWIFI && WLAN_80211
 
        config RKWIFI_26M
        bool "26M"
-           depends on RKWIFI && WLAN_80211 && RK903
+           depends on RKWIFI && WLAN_80211
+
+       config RKWIFI_24M
+       bool "24M"
+           depends on RKWIFI && WLAN_80211
 
 endchoice
 

diff --git a/drivers/net/wireless/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rkwifi/rk_wifi_config.c
index 82a0192c06765e7fc158f4b650fc8ecf5fc5e840..1816905e01d4b32e454afb992885089f46bb8ffc 100644 (file)
--- a/drivers/net/wireless/rkwifi/rk_wifi_config.c
+++ b/drivers/net/wireless/rkwifi/rk_wifi_config.c
@@ -58,8 +58,13 @@ int rkwifi_set_firmware(char *fw, char *nvram)
 
 #ifdef CONFIG_AP6210
     sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK901.bin");
+#ifdef CONFIG_RKWIFI_26M
        sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_AP6210.txt");
 #endif
+#ifdef CONFIG_RKWIFI_24M
+       sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_AP6210_24M.txt");
+#endif
+#endif
 
 #ifdef CONFIG_AP6476
     sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK901.bin");