diff options
| author | Ravindra Lokhande <rlokhande@nvidia.com> | 2010-11-30 19:00:44 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2010-12-01 15:20:25 -0800 |
| commit | cd25a25d7a70ec8d45f24f4183e8b3f35a1b5411 (patch) | |
| tree | 07513f066f9160439209cdc65636dacee68ce833 /sound/soc/tegra/tegra_pcm_rpc.c | |
| parent | 0fb1d22236e062c48a112d3cd0c1f6e6d90023a3 (diff) | |
[tegra ALSA] separated i2s1 and i2s2 path
In order to support concurrent playback/record
from i2s1 and i2s2, separated i2s1 and i2s2 path.
Change-Id: I2c19d76605d243e3e5375047ea0e799c4eb823b5
Reviewed-on: http://git-master/r/11677
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Tested-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'sound/soc/tegra/tegra_pcm_rpc.c')
| -rw-r--r-- | sound/soc/tegra/tegra_pcm_rpc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_pcm_rpc.c b/sound/soc/tegra/tegra_pcm_rpc.c index fd1c8cb55ee3..f6cd0861a698 100644 --- a/sound/soc/tegra/tegra_pcm_rpc.c +++ b/sound/soc/tegra/tegra_pcm_rpc.c @@ -540,10 +540,11 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) sema_init(&prtd->buf_done_sem, 0); sema_init(&prtd->stop_done_sem, 0); - if (pcm->device == I2S2) - hSource = ptscx->mi2s2; - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK){ + hSource = ptscx->i2s1_play_mix; + if (pcm->device == I2S2) + hSource = ptscx->i2s2_play_mix; + prtd->mixer_buffer = ptscx->mixer_buffer[0]; prtd->stdoutpath = (StandardPath*)kzalloc(sizeof(StandardPath), GFP_KERNEL); @@ -594,6 +595,10 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) goto fail; } } else { + hSource = ptscx->i2s1_rec_split; + if (pcm->device == I2S2) + hSource = ptscx->i2s2_rec_split; + prtd->mixer_buffer = ptscx->mixer_buffer[1]; prtd->stdinpath = (StandardPath*)kzalloc(sizeof(StandardPath), GFP_KERNEL); |