From 0f7f0d1406bec0a2d4e94524249fa82be1dfdf3b Mon Sep 17 00:00:00 2001
From: hwg <hwg@rock-chips.com>
Date: Wed, 9 May 2012 15:11:42 +0800
Subject: [PATCH] rkwifi: add crystal freq select for 26M and 37.4M

---
 drivers/net/wireless/Kconfig                 | 15 +++++++++++++++
 drivers/net/wireless/rkwifi/rk_wifi_config.c | 16 ++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 215b659afa19..d77df10c3b87 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -97,5 +97,20 @@ choice
 
 endchoice
 
+choice	
+	depends on RKWIFI && WLAN_80211
+	prompt "Select the wifi module crystal freq"
+	default 37_4M
+
+	config 37_4M
+    	bool "37_4M"
+	    depends on RKWIFI && WLAN_80211
+
+	config 26M
+    	bool "26M"
+	    depends on RKWIFI && WLAN_80211
+
+endchoice
+
 endif
 
diff --git a/drivers/net/wireless/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rkwifi/rk_wifi_config.c
index e94eaa8c42dd..12471adb4b8e 100644
--- a/drivers/net/wireless/rkwifi/rk_wifi_config.c
+++ b/drivers/net/wireless/rkwifi/rk_wifi_config.c
@@ -23,12 +23,6 @@ int rkwifi_set_country_code(char *code)
 	return 0;
 }
 
-/* 
- * Set Crystal Freq
- */
- 
-#define CRYSTAL_FREQ 0 // 0: 37.4M; 1: 26M
-
 /* 
  * Set Firmware Path
  */
@@ -39,18 +33,20 @@ int rkwifi_set_firmware(char *fw, char *nvram)
 {
 #ifdef CONFIG_RK903
 	sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK903.bin");
-#if CRYSTAL_FREQ	
+#ifdef CONFIG_26M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK903_26M.cal");
-#else	
+#endif
+#ifdef CONFIG_37_4M	
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK903.cal");
 #endif	
 #endif	
 
 #ifdef CONFIG_RK901
 	sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK901.bin");
-#if CRYSTAL_FREQ
+#ifdef CONFIG_26M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901_26M.txt");
-#else
+#endif
+#ifdef CONFIG_37_4M
 	sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901.txt");
 #endif
 #endif
-- 
2.34.1