From: CMY <cmy@rock-chips.com>
Date: Tue, 24 Apr 2012 10:34:16 +0000 (+0800)
Subject: change rfkill's name by wifi/bt chip
X-Git-Tag: firefly_0821_release~9326
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c2ca6890465385a2a0c7f48b1585aa1fb70223b5;p=firefly-linux-kernel-4.4.55.git

change rfkill's name by wifi/bt chip
---

diff --git a/arch/arm/mach-rk30/board-rk30-phone-rfkill.c b/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
index 193c6472f5a8..179a1cd8d226 100755
--- a/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-phone-rfkill.c
@@ -59,7 +59,18 @@ struct bt_ctrl
 #define BT_WAKE_LOCK_TIMEOUT    10 //s
 #endif
 
-static const char bt_name[] = "bcm4329";
+static const char bt_name[] = 
+#if defined(CONFIG_RKWIFI)
+    "rk903"
+#elif defined(CONFIG_BCM4329)
+    "bcm4329"
+#elif defined(CONFIG_MV8787)
+    "mv8787"
+#else
+    "bt_default"
+#endif
+;
+
 extern int rk29sdk_bt_power_state;
 extern int rk29sdk_wifi_power_state;
 
diff --git a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
index faeb3b717a71..8250806d6e6c 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-rfkill.c
@@ -64,7 +64,18 @@ struct bt_ctrl
 #define BT_WAKE_LOCK_TIMEOUT    10 //s
 #endif
 
-static const char bt_name[] = "bcm4330";
+static const char bt_name[] = 
+#if defined(CONFIG_RKWIFI)
+    "rk903"
+#elif defined(CONFIG_BCM4329)
+    "bcm4329"
+#elif defined(CONFIG_MV8787)
+    "mv8787"
+#else
+    "bt_default"
+#endif
+;
+
 //extern int rk29sdk_bt_power_state;
 //extern int rk29sdk_wifi_power_state;