Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into hwg

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-rk30 / board-rk30-sdk.c

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index 22be0cae5552fc137ebb08aa191e6ea8b6d037a8..6b4d2af969e63191968b999a6196eeecb5c26780 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -915,6 +915,13 @@ struct rk29_sdmmc_platform_data default_sdmmc1_data = {
 
 };
 #endif //endif--#ifdef CONFIG_SDMMC1_RK29
+
+/* bluetooth rfkill device */
+static struct platform_device rk29sdk_rfkill = {
+        .name = "rk29sdk_rfkill",
+        .id = -1,
+};
+
 /**************************************************************************************************
  * the end of setting for SDMMC devices
 **************************************************************************************************/
@@ -941,6 +948,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_WIFI_CONTROL_FUNC
        &rk29sdk_wifi_device,
 #endif
+#ifdef CONFIG_BT
+    &rk29sdk_rfkill,
+#endif
 };
 
 // i2c