Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: fsl_sai: Fix sync error in consumer mode

When configured for default synchronisation (Rx syncs to Tx) and the
SAI operates in consumer mode (clocks provided externally to Tx), a
synchronisation error occurs on Tx on the first attempt after device
initialisation when the playback stream is started while a capture
stream is already active. This results in channel shift/swap on the
playback stream.
Subsequent streams (ie after that first failing one) always work
correctly, no matter the order, with or without the other stream active.

This issue was observed (and fix tested) on an i.MX6UL board connected
to an ADAU1761 codec, where the codec provides both frame and bit clock
(connected to TX pins).

To fix this, always initialize the 'other' xCR4 and xCR5 registers when
we're starting a stream which is synced to the opposite one, irregardless
of the producer/consumer status.

Fixes: 51659ca069ce ("ASoC: fsl-sai: set xCR4/xCR5/xMR for SAI master mode")

Signed-off-by: Maarten Zanders <maarten@zanders.be>
Reviewed-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Link: https://patch.msgid.link/20251024135716.584265-1-maarten@zanders.be
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Maarten Zanders and committed by
Mark Brown
b2dd1d0d c8b88047

+4 -4
+4 -4
sound/soc/fsl/fsl_sai.c
··· 652 652 val_cr4 |= FSL_SAI_CR4_CHMOD; 653 653 654 654 /* 655 - * For SAI provider mode, when Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will 656 - * generate bclk and frame clock for Tx(Rx), we should set RCR4(TCR4), 657 - * RCR5(TCR5) for playback(capture), or there will be sync error. 655 + * When Tx(Rx) sync with Rx(Tx) clock, Rx(Tx) will provide bclk and 656 + * frame clock for Tx(Rx). We should set RCR4(TCR4), RCR5(TCR5) 657 + * for playback(capture), or there will be sync error. 658 658 */ 659 659 660 - if (!sai->is_consumer_mode[tx] && fsl_sai_dir_is_synced(sai, adir)) { 660 + if (fsl_sai_dir_is_synced(sai, adir)) { 661 661 regmap_update_bits(sai->regmap, FSL_SAI_xCR4(!tx, ofs), 662 662 FSL_SAI_CR4_SYWD_MASK | FSL_SAI_CR4_FRSZ_MASK | 663 663 FSL_SAI_CR4_CHMOD_MASK,