arm: tegra: remove comms configuration based on commchip_id
Nagarjuna Kristam [Wed, 31 Oct 2012 12:43:10 +0000 (17:43 +0530)]
comms chip is auto detected and configurations are loaded correspondigly.
so remove commchip_id dependency to perform BT/Wifi configurations.

Bug 1167337

Change-Id: I4ae4df126d0ec00bf6fa1f3c8753149808a0b751
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/163937
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

arch/arm/mach-tegra/board-dalmore.c
arch/arm/mach-tegra/board-pluto.c

index cf007cf..003c3f3 100644 (file)
@@ -81,6 +81,7 @@
 static struct rfkill_gpio_platform_data dalmore_bt_rfkill_pdata = {
                .name           = "bt_rfkill",
                .shutdown_gpio  = TEGRA_GPIO_PQ7,
+               .reset_gpio     = TEGRA_GPIO_PQ6,
                .type           = RFKILL_TYPE_BLUETOOTH,
 };
 
@@ -120,11 +121,6 @@ static struct platform_device dalmore_bluesleep_device = {
 
 static noinline void __init dalmore_setup_bt_rfkill(void)
 {
-       if ((tegra_get_commchip_id() == COMMCHIP_BROADCOM_BCM43241) ||
-               (tegra_get_commchip_id() == COMMCHIP_DEFAULT))
-               dalmore_bt_rfkill_pdata.reset_gpio = TEGRA_GPIO_INVALID;
-       else
-               dalmore_bt_rfkill_pdata.reset_gpio = TEGRA_GPIO_PQ6;
        platform_device_register(&dalmore_bt_rfkill_device);
 }
 
index 8e8d80f..4ad9c10 100644 (file)
@@ -84,6 +84,7 @@
 static struct rfkill_gpio_platform_data pluto_bt_rfkill_pdata = {
        .name           = "bt_rfkill",
        .shutdown_gpio  = TEGRA_GPIO_PQ7,
+       .reset_gpio     = TEGRA_GPIO_PQ6,
        .type           = RFKILL_TYPE_BLUETOOTH,
 };
 
@@ -97,11 +98,6 @@ static struct platform_device pluto_bt_rfkill_device = {
 
 static noinline void __init pluto_setup_bt_rfkill(void)
 {
-       if ((tegra_get_commchip_id() == COMMCHIP_BROADCOM_BCM43241) ||
-                               (tegra_get_commchip_id() == COMMCHIP_DEFAULT))
-               pluto_bt_rfkill_pdata.reset_gpio = TEGRA_GPIO_INVALID;
-       else
-               pluto_bt_rfkill_pdata.reset_gpio = TEGRA_GPIO_PU6;
        platform_device_register(&pluto_bt_rfkill_device);
 }