Merge c0b9e1dcd8 on remote branch

Change-Id: I25f96ad241db0fc8a5a70a232fe6dd5217e31def
This commit is contained in:
Linux Build Service Account 2022-11-14 03:36:05 -08:00
commit 00633aa23b
2 changed files with 22 additions and 12 deletions

View file

@ -212,9 +212,13 @@ const struct snd_soc_dapm_route tavil_audio_map[] = {
*/
/* Virtual input widgets */
{"AIF1 CAP", NULL, "AIF1_CAP Mixer"},
{"AIF2 CAP", NULL, "AIF2_CAP Mixer"},
{"AIF3 CAP", NULL, "AIF3_CAP Mixer"},
{"AIF1 CAP", NULL, "AIF1_CAP_MIX"},
{"AIF2 CAP", NULL, "AIF2_CAP_MIX"},
{"AIF3 CAP", NULL, "AIF3_CAP_MIX"},
{"AIF1_CAP_MIX", NULL, "AIF1_CAP Mixer"},
{"AIF2_CAP_MIX", NULL, "AIF2_CAP Mixer"},
{"AIF3_CAP_MIX", NULL, "AIF3_CAP Mixer"},
/* WDMA3 */
{"WDMA3 PORT0 MUX", "DEC0", "ADC MUX0"},

View file

@ -8187,15 +8187,21 @@ static const struct snd_soc_dapm_widget tavil_dapm_widgets[] = {
tavil_codec_force_enable_micbias,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_AIF_OUT_E("AIF1 CAP", "AIF1 Capture", 0, SND_SOC_NOPM,
AIF1_CAP, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_AIF_OUT_E("AIF2 CAP", "AIF2 Capture", 0, SND_SOC_NOPM,
AIF2_CAP, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_AIF_OUT_E("AIF3 CAP", "AIF3 Capture", 0, SND_SOC_NOPM,
AIF3_CAP, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_AIF_OUT("AIF1 CAP", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_AIF_OUT("AIF2 CAP", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_AIF_OUT("AIF3 CAP", "AIF3 Capture", 0, SND_SOC_NOPM, 0, 0),
SND_SOC_DAPM_MIXER_E("AIF1_CAP_MIX", SND_SOC_NOPM, AIF1_CAP, 0,
NULL, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MIXER_E("AIF2_CAP_MIX", SND_SOC_NOPM, AIF2_CAP, 0,
NULL, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MIXER_E("AIF3_CAP_MIX", SND_SOC_NOPM, AIF3_CAP, 0,
NULL, 0, tavil_codec_enable_tx,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MIXER("SLIM TX0", SND_SOC_NOPM, 0, 0, NULL, 0),
SND_SOC_DAPM_MIXER("SLIM TX1", SND_SOC_NOPM, 0, 0, NULL, 0),