evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASoC: wcd9335: Add dapm ignore suspend for backend dais"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-01 21:56:47 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0e0074f51e
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sound/soc/codecs/wcd9335.c Executable file → Normal file
View file

@ -3289,7 +3289,7 @@ static int __tasha_codec_enable_slimtx(struct snd_soc_codec *codec,
ret = wcd9xxx_disconnect_port(core,
&dai->wcd9xxx_ch_list,
dai->grph);
pr_debug("%s: Disconnect RX port, ret = %d\n",
pr_debug("%s: Disconnect TX port, ret = %d\n",
__func__, ret);
}
@ -13098,6 +13098,20 @@ static int tasha_codec_probe(struct snd_soc_codec *codec)
control->tx_chs = ptr + sizeof(tasha_rx_chs);
memcpy(control->tx_chs, tasha_tx_chs, sizeof(tasha_tx_chs));
snd_soc_dapm_ignore_suspend(dapm, "AIF1 Playback");
snd_soc_dapm_ignore_suspend(dapm, "AIF1 Capture");
snd_soc_dapm_ignore_suspend(dapm, "AIF2 Playback");
snd_soc_dapm_ignore_suspend(dapm, "AIF2 Capture");
if (tasha->intf_type == WCD9XXX_INTERFACE_TYPE_SLIMBUS) {
snd_soc_dapm_ignore_suspend(dapm, "AIF3 Playback");
snd_soc_dapm_ignore_suspend(dapm, "AIF3 Capture");
snd_soc_dapm_ignore_suspend(dapm, "AIF4 Playback");
snd_soc_dapm_ignore_suspend(dapm, "AIF Mix Playback");
snd_soc_dapm_ignore_suspend(dapm, "AIF4 MAD TX");
snd_soc_dapm_ignore_suspend(dapm, "VIfeed");
}
snd_soc_dapm_sync(dapm);
ret = tasha_setup_irqs(tasha);