Merge "ASoC: msmcobalt: clean up bootup errors"
This commit is contained in:
commit
1681e23d60
1 changed files with 9 additions and 6 deletions
|
@ -3258,19 +3258,22 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "EAR");
|
snd_soc_dapm_ignore_suspend(dapm, "EAR");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT1");
|
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT1");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT2");
|
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT2");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT3");
|
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT4");
|
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "ANC EAR");
|
snd_soc_dapm_ignore_suspend(dapm, "ANC EAR");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "SPK1 OUT");
|
snd_soc_dapm_ignore_suspend(dapm, "SPK1 OUT");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "SPK2 OUT");
|
snd_soc_dapm_ignore_suspend(dapm, "SPK2 OUT");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "HPHL");
|
snd_soc_dapm_ignore_suspend(dapm, "HPHL");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "HPHR");
|
snd_soc_dapm_ignore_suspend(dapm, "HPHR");
|
||||||
|
snd_soc_dapm_ignore_suspend(dapm, "AIF4 VI");
|
||||||
|
snd_soc_dapm_ignore_suspend(dapm, "VIINPUT");
|
||||||
|
|
||||||
|
if (!strcmp(dev_name(codec_dai->dev), "tasha_codec")) {
|
||||||
|
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT3");
|
||||||
|
snd_soc_dapm_ignore_suspend(dapm, "LINEOUT4");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "ANC HPHL");
|
snd_soc_dapm_ignore_suspend(dapm, "ANC HPHL");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "ANC HPHR");
|
snd_soc_dapm_ignore_suspend(dapm, "ANC HPHR");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT1");
|
snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT1");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT2");
|
snd_soc_dapm_ignore_suspend(dapm, "ANC LINEOUT2");
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "AIF4 VI");
|
}
|
||||||
snd_soc_dapm_ignore_suspend(dapm, "VIINPUT");
|
|
||||||
|
|
||||||
snd_soc_dapm_sync(dapm);
|
snd_soc_dapm_sync(dapm);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue