diff options
| author | Nikesh Oswal <noswal@nvidia.com> | 2011-08-09 19:32:17 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-18 16:33:44 -0700 |
| commit | 53117d4aaac8b5aff8682866644427958e2441b0 (patch) | |
| tree | b0ba39cb5a355f65caad6ba6525ac943238b6cc4 /arch | |
| parent | c52a7398c2a1960865ddfc75d94403757b1af256 (diff) | |
asoc: tegra: bt-sco bringup on enterprise
add code for bt-sco playback and record support
Bug 864984
Change-Id: I003b58f333bcba371129a9069c2b453e1e8380c0
Reviewed-on: http://git-master/r/46084
Tested-by: Nikesh Oswal <noswal@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/audio_manager.c | 54 |
1 files changed, 38 insertions, 16 deletions
diff --git a/arch/arm/mach-tegra/audio_manager.c b/arch/arm/mach-tegra/audio_manager.c index a983cace9a3f..21bdc0431830 100644 --- a/arch/arm/mach-tegra/audio_manager.c +++ b/arch/arm/mach-tegra/audio_manager.c @@ -389,6 +389,15 @@ int default_record_connection(aud_dev_info *devinfo) } +int default_playback_bt_connection(aud_dev_info *devinfo) +{ + struct am_dev_fns *am_fn = &init_am_dev_fns[devinfo->dev_type]; + return am_fn->aud_dev_get_dma_requestor(devinfo->dev_id, + AUDIO_TX_MODE); + +} + + int default_playback_connection(struct am_ch_info *ch, int ifc, int fifo_mode) { /* get unused dam channel first */ @@ -443,6 +452,7 @@ conn_fail: return -ENOENT; } + int free_dam_connection(aud_dev_info *devinfo) { int damch = 0; @@ -537,24 +547,36 @@ int am_get_dma_requestor(aud_dev_info* devinfo) ch->ahubtx_index = ahubindex; if (fifo_mode == AUDIO_TX_MODE) { - - err = default_playback_connection(ch, - dev_id, fifo_mode); - if (err) - goto fail_conn; - - if (devinfo->dev_type == AUDIO_I2S_DEVICE) { - i2s_set_dma_channel(dev_id, - fifo_mode, (ch->dmach[fifo_mode] - 1)); - i2s_set_acif(dev_id, fifo_mode, &ch->inacif); - } else if (devinfo->dev_type == AUDIO_SPDIF_DEVICE) { - spdif_set_dma_channel(dev_id, - fifo_mode, (ch->dmach[fifo_mode] - 1)); - spdif_set_acif(dev_id, - fifo_mode, (void *)&ch->inacif); + if (dev_id != aud_manager->bt_port_idx) { + err = default_playback_connection(ch, + dev_id, fifo_mode); + if (err) + goto fail_conn; + + if (devinfo->dev_type == AUDIO_I2S_DEVICE) { + i2s_set_dma_channel(dev_id, + fifo_mode, (ch->dmach[fifo_mode] - 1)); + i2s_set_acif(dev_id, fifo_mode, + &ch->inacif); + } else if (devinfo->dev_type + == AUDIO_SPDIF_DEVICE) { + spdif_set_dma_channel(dev_id, + fifo_mode, (ch->dmach[fifo_mode] - 1)); + spdif_set_acif(dev_id, + fifo_mode, (void *)&ch->inacif); + } + } else { + struct am_dev_fns *am_fn = + &init_am_dev_fns[devinfo->dev_type]; + + am_fn->aud_dev_clock_enable(devinfo->dev_id, + fifo_mode); + ch->dmach[fifo_mode] = + default_playback_bt_connection(devinfo); } } else { - struct am_dev_fns *am_fn = &init_am_dev_fns[devinfo->dev_type]; + struct am_dev_fns *am_fn = + &init_am_dev_fns[devinfo->dev_type]; am_fn->aud_dev_clock_enable(devinfo->dev_id, fifo_mode); ch->dmach[fifo_mode] = |