Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bdd5932 authored by Andreas Dannenberg's avatar Andreas Dannenberg Committed by Mark Brown
Browse files

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: default avatarAndreas Dannenberg <dannenberg@ti.com>
Reviewed-by: default avatarJyri Sarha <jsarha@ti.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bb9a13a0

sound/soc/davinci/davinci-mcasp.c

+2 −2
Original line number Diff line number Diff line
@@ -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);