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-ventana.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-ventana.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 942ca44e2a13..c8c9ac49745f 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -38,6 +38,7 @@ #include <linux/memblock.h> #include <linux/i2c/atmel_mxt_ts.h> #include <linux/tegra_uart.h> +#include <linux/rfkill-gpio.h> #include <sound/wm8903.h> @@ -64,26 +65,27 @@ #include "pm.h" -static struct resource ventana_bcm4329_rfkill_resources[] = { +static struct rfkill_gpio_platform_data ventana_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 ventana_bcm4329_rfkill_device = { - .name = "bcm4329_rfkill", +static struct platform_device ventana_bt_rfkill_device = { + .name = "rfkill_gpio", .id = -1, - .num_resources = ARRAY_SIZE(ventana_bcm4329_rfkill_resources), - .resource = ventana_bcm4329_rfkill_resources, + .dev = { + .platform_data = ventana_bt_rfkill_pdata, + }, }; static void __init ventana_bt_rfkill(void) { /*Add Clock Resource*/ - clk_add_alias("bcm4329_32k_clk", ventana_bcm4329_rfkill_device.name, \ + clk_add_alias("bcm4329_32k_clk", ventana_bt_rfkill_device.name, \ "blink", NULL); return; } @@ -380,7 +382,7 @@ static struct platform_device *ventana_devices[] __initdata = { &tegra_das_device, &spdif_dit_device, &bluetooth_dit_device, - &ventana_bcm4329_rfkill_device, + &ventana_bt_rfkill_device, &tegra_pcm_device, &ventana_audio_device, }; |