rkwifi: change config name for 26M and 37.4M, and update bt chip name

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
index dcfd5c0bf42ab55810cbfc55ed5b938d4933791f..459aad0620297bfd0ec9d14c186d21b9ae3b0012 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
@@ -73,7 +73,11 @@ struct bt_ctrl
 
 static const char bt_name[] = 
 #if defined(CONFIG_RKWIFI)
-    "rk903"
+    #if defined(CONFIG_RKWIFI_26M)
+        "rk903_26M"
+    #else
+        "rk903"
+    #endif
 #elif defined(CONFIG_BCM4329)
     "bcm4329"
 #elif defined(CONFIG_MV8787)

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index d77df10c3b87dae00808a56b25bed1243e6c2d5e..e3abd49317a2e05750ee11705776124f4beb8d8e 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -100,13 +100,13 @@ endchoice
 choice 
        depends on RKWIFI && WLAN_80211
        prompt "Select the wifi module crystal freq"
-       default 37_4M
+       default RKWIFI_37_4M
 
-       config 37_4M
+       config RKWIFI_37_4M
        bool "37_4M"
            depends on RKWIFI && WLAN_80211
 
-       config 26M
+       config RKWIFI_26M
        bool "26M"
            depends on RKWIFI && WLAN_80211
 

diff --git a/drivers/net/wireless/rkwifi/rk_wifi_config.c b/drivers/net/wireless/rkwifi/rk_wifi_config.c
index 12471adb4b8ec452feab38f2b05862aa130d5601..df19f33e17e76ad8698bfd71221fa32208f4fdc1 100644 (file)
--- a/drivers/net/wireless/rkwifi/rk_wifi_config.c
+++ b/drivers/net/wireless/rkwifi/rk_wifi_config.c
@@ -33,20 +33,20 @@ int rkwifi_set_firmware(char *fw, char *nvram)
 {
 #ifdef CONFIG_RK903
        sprintf(fw, "%s%s", ANDROID_FW_PATH, "fw_RK903.bin");
-#ifdef CONFIG_26M
+#ifdef CONFIG_RKWIFI_26M
        sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK903_26M.cal");
 #endif
-#ifdef CONFIG_37_4M    
+#ifdef CONFIG_RKWIFI_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");
-#ifdef CONFIG_26M
+#ifdef CONFIG_RKWIFI_26M
        sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901_26M.txt");
 #endif
-#ifdef CONFIG_37_4M
+#ifdef CONFIG_RKWIFI_37_4M
        sprintf(nvram, "%s%s", ANDROID_FW_PATH, "nvram_RK901.txt");
 #endif
 #endif