diff options
| author | Nagarjuna Kristam <nkristam@nvidia.com> | 2012-06-04 10:00:53 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-20 14:30:50 -0700 |
| commit | afdea81a3395e0e7a85b0711d2a612f14d52d333 (patch) | |
| tree | c2cc12fefc3b6113d53b303e0b8b987fbae9e4f9 /arch/arm/mach-tegra/board-whistler.c | |
| parent | aaf1ed5147b77710129ed3021dc2912360dc29ef (diff) | |
arm: tegra: use rfkill-gpio driver to register bluetooth rfkill
rfkill-gpio driver is available in linux delivery as a generic rfkill driver.
use rfkill-gpio driver to perform bluetooth RFKILL gpio activities, instead of
bcm4329 rfkill driver.
Bug 993990
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Change-Id: I654b93f099431029177913605d15ad921df07833
Reviewed-on: http://git-master/r/108499
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index 6156c8a8e51d..aa0e1c04dc52 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -37,6 +37,7 @@ #include <linux/mfd/max8907c.h> #include <linux/memblock.h> #include <linux/tegra_uart.h> +#include <linux/rfkill-gpio.h> #include <mach/clk.h> #include <mach/iomap.h> @@ -169,21 +170,21 @@ static void __init whistler_uart_init(void) platform_add_devices(whistler_uart_devices, ARRAY_SIZE(whistler_uart_devices)); } - -static struct resource whistler_bcm4329_rfkill_resources[] = { +static struct rfkill_gpio_platform_data whistler_bt_rfkill_pdata[] = { { - .name = "bcm4329_nshutdown_gpio", - .start = TEGRA_GPIO_PU0, - .end = TEGRA_GPIO_PU0, - .flags = IORESOURCE_IO, + .name = "bt_rfkill", + .shutdown_gpio = TEGRA_GPIO_PU0, + .reset_gpio = TEGRA_GPIO_INVALID, + .type = RFKILL_TYPE_BLUETOOTH, }, }; -static struct platform_device whistler_bcm4329_rfkill_device = { - .name = "bcm4329_rfkill", - .id = -1, - .num_resources = ARRAY_SIZE(whistler_bcm4329_rfkill_resources), - .resource = whistler_bcm4329_rfkill_resources, +static struct platform_device whistler_bt_rfkill_device = { + .name = "rfkill_gpio", + .id = -1, + .dev = { + .platform_data = whistler_bt_rfkill_pdata, + }, }; static struct resource whistler_bluesleep_resources[] = { @@ -393,7 +394,7 @@ static struct platform_device *whistler_devices[] __initdata = { &spdif_dit_device, &bluetooth_dit_device, &baseband_dit_device, - &whistler_bcm4329_rfkill_device, + &whistler_bt_rfkill_device, &tegra_pcm_device, &whistler_audio_aic326x_device, &whistler_audio_wm8753_device, |