From afdea81a3395e0e7a85b0711d2a612f14d52d333 Mon Sep 17 00:00:00 2001 From: Nagarjuna Kristam Date: Mon, 4 Jun 2012 10:00:53 +0530 Subject: 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 Change-Id: I654b93f099431029177913605d15ad921df07833 Reviewed-on: http://git-master/r/108499 Reviewed-by: Simone Willett Tested-by: Simone Willett --- arch/arm/mach-tegra/board-enterprise.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'arch/arm/mach-tegra/board-enterprise.c') diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index 2b5a72518d7c..316e41da8672 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -79,20 +80,21 @@ static struct tegra_thermal_data thermal_data = { #endif }; -static struct resource enterprise_bcm4329_rfkill_resources[] = { +static struct rfkill_gpio_platform_data enterprise_bt_rfkill_pdata[] = { { - .name = "bcm4329_nshutdown_gpio", - .start = TEGRA_GPIO_PE6, - .end = TEGRA_GPIO_PE6, - .flags = IORESOURCE_IO, + .name = "bt_rfkill", + .shutdown_gpio = TEGRA_GPIO_PE6, + .reset_gpio = TEGRA_GPIO_INVALID, + .type = RFKILL_TYPE_BLUETOOTH, }, }; -static struct platform_device enterprise_bcm4329_rfkill_device = { - .name = "bcm4329_rfkill", +static struct platform_device enterprise_bt_rfkill_device = { + .name = "rfkill_gpio", .id = -1, - .num_resources = ARRAY_SIZE(enterprise_bcm4329_rfkill_resources), - .resource = enterprise_bcm4329_rfkill_resources, + .dev = { + .platform_data = &enterprise_bt_rfkill_pdata, + }, }; static struct resource enterprise_bluesleep_resources[] = { @@ -516,7 +518,7 @@ static struct platform_device *enterprise_devices[] __initdata = { &tegra_avp_device, #endif &tegra_camera, - &enterprise_bcm4329_rfkill_device, + &enterprise_bt_rfkill_device, &tegra_spi_device4, &tegra_hda_device, #if defined(CONFIG_CRYPTO_DEV_TEGRA_SE) -- cgit v1.2.3