arm: tegra: cardhu: enabling bluetooth
Rakesh Goyal [Sat, 29 Jan 2011 21:58:42 +0000 (13:58 -0800)]
enabling bluetooth, removing optional code.

Original-Change-Id: Ib2e88a88beae53106c7570b19fa7f6a7affa48bd
Reviewed-on: http://git-master/r/17580
Tested-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I58484d31ee996e8fa3506ec5b931d284eb5c67e2

Rebase-Id: R1abe5fae40391a6baf7b16b0b28a3a8a25970851

arch/arm/mach-tegra/board-cardhu.c

index 8532533..721c74a 100644 (file)
@@ -109,17 +109,11 @@ static struct tegra_ulpi_config ulpi_phy_config = {
 #ifdef CONFIG_BCM4329_RFKILL
 static struct resource cardhu_bcm4329_rfkill_resources[] = {
        {
-               .name   = "bcm4329_nreset_gpio",
+               .name   = "bcm4329_nshutdown_gpio",
                .start  = TEGRA_GPIO_PU0,
                .end    = TEGRA_GPIO_PU0,
                .flags  = IORESOURCE_IO,
        },
-       {
-               .name   = "bcm4329_nshutdown_gpio",
-               .start  = TEGRA_GPIO_PK2,
-               .end    = TEGRA_GPIO_PK2,
-               .flags  = IORESOURCE_IO,
-       },
 };
 
 static struct platform_device cardhu_bcm4329_rfkill_device = {
@@ -131,10 +125,6 @@ static struct platform_device cardhu_bcm4329_rfkill_device = {
 
 static noinline void __init cardhu_bt_rfkill(void)
 {
-       /*Add Clock Resource*/
-       clk_add_alias("bcm4329_32k_clk", cardhu_bcm4329_rfkill_device.name, \
-                               "blink", NULL);
-
        platform_device_register(&cardhu_bcm4329_rfkill_device);
 
        return;