samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: codecs: fix incorrect micbias value set at rouleur"

Browse Source
This commit is contained in:
qctecmdr
2020-04-29 22:27:54 -07:00
committed by Gerrit - the friendly Code Review server
parent e000435f75 27b6c75029
commit 8310f644b9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
asoc/codecs/rouleur/rouleur.c
View File

@@ -1118,7 +1118,7 @@ int rouleur_mbhc_micb_adjust_voltage(struct snd_soc_component *component,
*/ */
cur_vout_ctl = (snd_soc_component_read32(component, cur_vout_ctl = (snd_soc_component_read32(component,
ROULEUR_ANA_MICBIAS_LDO_1_SETTING)) & 0xF8; ROULEUR_ANA_MICBIAS_LDO_1_SETTING)) & 0xF8;
cur_vout_ctl = cur_vout_ctl >> 3;
req_vout_ctl = rouleur_get_micb_vout_ctl_val(req_volt); req_vout_ctl = rouleur_get_micb_vout_ctl_val(req_volt);
if (req_vout_ctl < 0) { if (req_vout_ctl < 0) {
ret = -EINVAL; ret = -EINVAL;
@@ -1138,7 +1138,7 @@ int rouleur_mbhc_micb_adjust_voltage(struct snd_soc_component *component,
pullup_mask); pullup_mask);
snd_soc_component_update_bits(component, snd_soc_component_update_bits(component,
ROULEUR_ANA_MICBIAS_LDO_1_SETTING, 0xF8, req_vout_ctl); ROULEUR_ANA_MICBIAS_LDO_1_SETTING, 0xF8, req_vout_ctl << 3);
if (micb_en == 0x1) { if (micb_en == 0x1) {
snd_soc_component_update_bits(component, micb_reg, snd_soc_component_update_bits(component, micb_reg,
@@ -1911,7 +1911,7 @@ static int rouleur_set_micbias_data(struct rouleur_priv *rouleur,
goto done; goto done;
} }
regmap_update_bits(rouleur->regmap, ROULEUR_ANA_MICBIAS_LDO_1_SETTING, regmap_update_bits(rouleur->regmap, ROULEUR_ANA_MICBIAS_LDO_1_SETTING,
0xF8, vout_ctl); 0xF8, vout_ctl << 3);
done: done:
return rc; return rc;
} }