diff options
| author | Andreas Dannenberg <dannenberg@ti.com> | 2015-11-09 12:19:19 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-10 18:49:59 +0000 |
| commit | 1bdd593247ee5a74eb58828a4cf18bdc8a5f1baa (patch) | |
| tree | 3897f076dd0fe9b3c14219517c45d51190269fcf /sound | |
| parent | bb9a13a0209c56cdf27d125a1f2f6f34378c64f4 (diff) | |
| download | linux-1bdd593247ee5a74eb58828a4cf18bdc8a5f1baa.tar.gz linux-1bdd593247ee5a74eb58828a4cf18bdc8a5f1baa.tar.bz2 linux-1bdd593247ee5a74eb58828a4cf18bdc8a5f1baa.zip | |
ASoC: davinci-mcasp: Fix TDM slot rx/tx mask associations
Fixes the associations between the tx_mask and rx_mask and the associated
playback / capture streams during setting of the TDM slot. With this
patch in place it is now possible for example to only populate tx_mask
(leaving rx_mask as 0) for output-only codecs to control the TDM slot(s)
the McASP serial port uses for transmit. Before that, this scenario
would incorrectly rely on the rx_mask for this.
Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
Reviewed-by: Jyri Sarha <jsarha@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 4495a40a9468..caa0bebcd7f4 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -681,8 +681,8 @@ static int davinci_mcasp_set_tdm_slot(struct snd_soc_dai *dai, } mcasp->tdm_slots = slots; - mcasp->tdm_mask[SNDRV_PCM_STREAM_PLAYBACK] = rx_mask; - mcasp->tdm_mask[SNDRV_PCM_STREAM_CAPTURE] = tx_mask; + mcasp->tdm_mask[SNDRV_PCM_STREAM_PLAYBACK] = tx_mask; + mcasp->tdm_mask[SNDRV_PCM_STREAM_CAPTURE] = rx_mask; mcasp->slot_width = slot_width; return davinci_mcasp_set_ch_constraints(mcasp); |