diff options
| author | Nagarjuna Kristam <nkristam@nvidia.com> | 2012-06-25 17:00:35 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-29 13:44:22 -0700 |
| commit | 8eb5b1c6e1641ed39d52a298fea5e3d2c493d174 (patch) | |
| tree | 7299baa18bd8e01baef934eb258efe0c961c1a0b /arch/arm/mach-tegra/board-kai.c | |
| parent | 97128e9343ad2833e538a7aaecadc7fbcfc9521e (diff) | |
arm: tegra: kai: use bluesleep driver for TI wl12xx bt chip
For TI WL12xx BT chip, register bluesleep driver to enable
"wake on bluetooth" feature
bug 1006864
Change-Id: I294afd2dad1974c57e0fe5d3c000d44433da6c05
Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
Reviewed-on: http://git-master/r/110855
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/board-kai.c b/arch/arm/mach-tegra/board-kai.c index 6ae6ed87a293..5dbb57b7cbb0 100644 --- a/arch/arm/mach-tegra/board-kai.c +++ b/arch/arm/mach-tegra/board-kai.c @@ -113,6 +113,12 @@ static noinline void __init kai_bt_st(void) static struct resource kai_bluesleep_resources[] = { [0] = { + .name = "gpio_host_wake", + .start = TEGRA_GPIO_PU6, + .end = TEGRA_GPIO_PU6, + .flags = IORESOURCE_IO, + }, + [1] = { .name = "host_wake", .start = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PU6), .end = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PU6), @@ -121,7 +127,7 @@ static struct resource kai_bluesleep_resources[] = { }; static struct platform_device kai_bluesleep_device = { - .name = "tibluesleep", + .name = "bluesleep", .id = 0, .num_resources = ARRAY_SIZE(kai_bluesleep_resources), .resource = kai_bluesleep_resources, @@ -129,14 +135,6 @@ static struct platform_device kai_bluesleep_device = { static noinline void __init kai_tegra_setup_tibluesleep(void) { - int ret; - - ret = gpio_request(TEGRA_GPIO_PU6, "host_wake"); - if (ret) - pr_err("gpio_request failed for gpio: %d\n", TEGRA_GPIO_PU6); - else - gpio_direction_input(TEGRA_GPIO_PU6); - platform_device_register(&kai_bluesleep_device); } @@ -827,8 +825,8 @@ static void __init tegra_kai_init(void) kai_touch_init(); kai_keys_init(); kai_panel_init(); - kai_bt_st(); kai_tegra_setup_tibluesleep(); + kai_bt_st(); kai_sensors_init(); kai_pins_state_init(); kai_emc_init(); |