From: CMY <cmy@rock-chips.com>
Date: Thu, 7 Jun 2012 06:25:54 +0000 (+0800)
Subject: rk29: sdk: refactor rfkill code
X-Git-Tag: firefly_0821_release~9121
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44c30859cf0fcf02d38afa970e5edb12398e6930;p=firefly-linux-kernel-4.4.55.git

rk29: sdk: refactor rfkill code
---

diff --git a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
index fd8a01c80ab0..91fc6b5301cd 100755
--- a/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
+++ b/arch/arm/mach-rk29/board-rk29-ddr3sdk.c
@@ -2939,6 +2939,9 @@ static struct platform_device *devices[] __initdata = {
 #ifdef CONFIG_SND_RK29_SOC_CS42L52
 	&rk29_cs42l52_device,
 #endif
+#ifdef CONFIG_RFKILL_RK
+	&device_rfkill_rk,
+#endif
 };
 
 /*****************************************************************************************
diff --git a/arch/arm/mach-rk29/devices.c b/arch/arm/mach-rk29/devices.c
index 26cdb9cbd548..779a9f13786c 100644
--- a/arch/arm/mach-rk29/devices.c
+++ b/arch/arm/mach-rk29/devices.c
@@ -884,10 +884,6 @@ static int __init rk29_init_devices(void)
 {
 	platform_device_register(&rk29_device_pmu);
 	platform_device_register(&rk29_device_pcm);
-#ifdef CONFIG_BT
-    extern struct platform_device device_rfkill_rk;
-    platform_device_register(&device_rfkill_rk);
-#endif
         return 0;
 }
 arch_initcall(rk29_init_devices);