Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4b7d283150b35db6e5e10f72606f603ff424c92a

Authored by Jarkko Nikula
Committed by Takashi Iwai
1 parent da6320becf
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching 

- Codec doesn't support to configure bit clock and frame sync polarities
- Codec doesn't support DSP_A format but DSP_B with inverted bit clock
  polarity
- Match also other formats with their signal polarities

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 10 additions and 6 deletions Side-by-side Diff

sound/soc/codecs/tlv320aic3x.c
Diff comments   View file @ 4b7d283
... ... @@ -863,17 +863,21 @@
863 863 return -EINVAL;
864 864 }
865 865  
866   - /* interface format */
867   - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
868   - case SND_SOC_DAIFMT_I2S:
  866 + /*
  867 + * match both interface format and signal polarities since they
  868 + * are fixed
  869 + */
  870 + switch (fmt & (SND_SOC_DAIFMT_FORMAT_MASK |
  871 + SND_SOC_DAIFMT_INV_MASK)) {
  872 + case (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF):
869 873 break;
870   - case SND_SOC_DAIFMT_DSP_A:
  874 + case (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF):
871 875 iface_breg |= (0x01 << 6);
872 876 break;
873   - case SND_SOC_DAIFMT_RIGHT_J:
  877 + case (SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF):
874 878 iface_breg |= (0x02 << 6);
875 879 break;
876   - case SND_SOC_DAIFMT_LEFT_J:
  880 + case (SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF):
877 881 iface_breg |= (0x03 << 6);
878 882 break;
879 883 default: