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

Merge "ASoC: wcd9xxx: Enable EAR LO concurrency in codec"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-19 09:52:43 -08:00 • committed by Gerrit - the friendly Code Review server
commit fdddc49ef2
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
sound/soc/codecs/wcd9xxx-common-v2.c
View file

@ -853,35 +853,35 @@ static void wcd_clsh_state_ear_lo(struct snd_soc_codec *codec,
dev_dbg(codec->dev, "%s: mode: %s, %s\n", __func__, mode_to_str(mode),
is_enable ? "enable" : "disable");
if (is_enable && (req_state == WCD_CLSH_STATE_LO)) {
wcd_clsh_set_buck_regulator_mode(codec, CLS_AB);
} else {
if (req_state == WCD_CLSH_STATE_EAR)
goto end;
/* LO powerdown.
* If EAR Class-H is already enabled, just
* turn on regulator other enable Class-H
* configuration
if (is_enable) {
/* LO powerup is taken care in PA sequence.
* No need to change to class AB here.
*/
if (wcd_clsh_enable_status(codec)) {
wcd_clsh_set_buck_regulator_mode(codec,
CLS_H_NORMAL);
goto end;
if (req_state == WCD_CLSH_STATE_EAR) {
/* EAR powerup.*/
if (!wcd_clsh_enable_status(codec)) {
wcd_enable_clsh_block(codec, clsh_d, true);
wcd_clsh_set_buck_mode(codec, mode);
wcd_clsh_set_flyback_mode(codec, mode);
}
snd_soc_update_bits(codec,
WCD9XXX_A_CDC_RX0_RX_PATH_CFG0,
0x40, 0x40);
}
wcd_enable_clsh_block(codec, clsh_d, true);
snd_soc_update_bits(codec,
WCD9XXX_A_CDC_RX0_RX_PATH_CFG0,
0x40, 0x40);
wcd_clsh_set_buck_regulator_mode(codec,
CLS_H_NORMAL);
wcd_clsh_set_buck_mode(codec, mode);
wcd_clsh_set_flyback_mode(codec, mode);
wcd_clsh_flyback_ctrl(codec, clsh_d, mode, true);
wcd_clsh_buck_ctrl(codec, clsh_d, mode, true);
} else {
if (req_state == WCD_CLSH_STATE_EAR) {
/* EAR powerdown.*/
wcd_enable_clsh_block(codec, clsh_d, false);
wcd_clsh_set_buck_mode(codec, CLS_H_NORMAL);
wcd_clsh_set_flyback_mode(codec, CLS_H_NORMAL);
snd_soc_update_bits(codec,
WCD9XXX_A_CDC_RX0_RX_PATH_CFG0,
0x40, 0x00);
}
/* LO powerdown is taken care in PA sequence.
* No need to change to class H here.
*/
}
end:
return;
}
static void wcd_clsh_state_hph_lo(struct snd_soc_codec *codec,
@ -1230,6 +1230,7 @@ static bool wcd_clsh_is_state_valid(u8 state)
case WCD_CLSH_STATE_HPHL_LO:
case WCD_CLSH_STATE_HPHR_LO:
case WCD_CLSH_STATE_HPH_ST_LO:
case WCD_CLSH_STATE_EAR_LO:
return true;
default:
return false;