From: 陈智 <cz@rock-chips.com> Date: Thu, 23 Dec 2010 07:21:34 +0000 (+0800) Subject: BT: rfkill is delete by other commit, so commit again X-Git-Tag: firefly_0821_release~10899^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=48514c0ee3066467023f5c9ddc703e6d4454ddd0;p=firefly-linux-kernel-4.4.55.git BT: rfkill is delete by other commit, so commit again --- diff --git a/arch/arm/mach-rk29/board-rk29sdk.c b/arch/arm/mach-rk29/board-rk29sdk.c index fa6fe26c67ae..d6357231e3c3 100755 --- a/arch/arm/mach-rk29/board-rk29sdk.c +++ b/arch/arm/mach-rk29/board-rk29sdk.c @@ -1092,6 +1092,14 @@ static struct platform_device rk29sdk_wifi_device = { }; #endif + +/* bluetooth rfkill device */ +static struct platform_device rk29sdk_rfkill = { + .name = "rk29sdk_rfkill", + .id = -1, +}; + + #ifdef CONFIG_VIVANTE static struct resource resources_gpu[] = { [0] = { @@ -1195,6 +1203,13 @@ static struct platform_device *devices[] __initdata = { #ifdef CONFIG_UART1_RK29 &rk29_device_uart1, #endif +#ifdef CONFIG_UART0_RK29 + &rk29_device_uart0, +#endif +#ifdef CONFIG_UART2_RK29 + &rk29_device_uart2, +#endif + #ifdef CONFIG_RK29_PWM_REGULATOR &rk29_device_pwm_regulator, #endif @@ -1244,6 +1259,11 @@ static struct platform_device *devices[] __initdata = { #ifdef CONFIG_WIFI_CONTROL_FUNC &rk29sdk_wifi_device, #endif + +#ifdef CONFIG_BT + &rk29sdk_rfkill, +#endif + #ifdef CONFIG_MTD_NAND_RK29 &rk29_device_nand, #endif