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

Merge "ASoC: wcd9335: don't check for HPHL and HPHR for mono headset"

Browse source
This commit is contained in:
Linux Build Service Account 2016-08-03 10:53:37 -07:00 • committed by Gerrit - the friendly Code Review server
commit 059df41e86
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/soc/codecs/wcd9335.c
View file

@ -3976,13 +3976,16 @@ static int tasha_codec_enable_hphr_pa(struct snd_soc_dapm_widget *w,
set_bit(HPH_PA_DELAY, &tasha->status_mask); set_bit(HPH_PA_DELAY, &tasha->status_mask);
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0) != 0xC0) if (!(strcmp(w->name, "ANC HPHR PA"))) {
if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0)
!= 0xC0)
/* /*
* If PA_EN is not set (potentially in ANC case) then * If PA_EN is not set (potentially in ANC case)
* do nothing for POST_PMU and let left channel handle * then do nothing for POST_PMU and let left
* everything. * channel handle everything.
*/ */
break; break;
}
/* /*
* 7ms sleep is required after PA is enabled as per * 7ms sleep is required after PA is enabled as per
* HW requirement * HW requirement
@ -4067,13 +4070,16 @@ static int tasha_codec_enable_hphl_pa(struct snd_soc_dapm_widget *w,
set_bit(HPH_PA_DELAY, &tasha->status_mask); set_bit(HPH_PA_DELAY, &tasha->status_mask);
break; break;
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0) != 0xC0) if (!(strcmp(w->name, "ANC HPHL PA"))) {
if ((snd_soc_read(codec, WCD9335_ANA_HPH) & 0xC0)
!= 0xC0)
/* /*
* If PA_EN is not set (potentially in ANC case) then * If PA_EN is not set (potentially in ANC case)
* do nothing for POST_PMU and let right channel handle * then do nothing for POST_PMU and let right
* everything. * channel handle everything.
*/ */
break; break;
}
/* /*
* 7ms sleep is required after PA is enabled as per * 7ms sleep is required after PA is enabled as per
* HW requirement * HW requirement