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

Merge "ASoC: codec: Disable surge protection before impedance detection"

Browse Source
This commit is contained in:
qctecmdr
2019-07-29 03:31:38 -07:00
committed by Gerrit - the friendly Code Review server
parent 237662b0a1 01a86d2895
commit e1770b9b21
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
asoc/codecs/wcd937x/wcd937x-mbhc.c
View File

@@ -547,6 +547,12 @@ static void wcd937x_wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl,
regmap_update_bits(wcd937x->regmap, regmap_update_bits(wcd937x->regmap,
WCD937X_ANA_MBHC_MECH, 0x01, 0x00); WCD937X_ANA_MBHC_MECH, 0x01, 0x00);
/* Disable surge protection before impedance detection.
* This is done to give correct value for high impedance.
*/
regmap_update_bits(wcd937x->regmap,
WCD937X_HPH_SURGE_HPHLR_SURGE_EN, 0xC0, 0x00);
/* First get impedance on Left */ /* First get impedance on Left */
d1 = d1_a[1]; d1 = d1_a[1];
zdet_param_ptr = &zdet_param[1]; zdet_param_ptr = &zdet_param[1];
@@ -663,6 +669,9 @@ right_ch_impedance:
mbhc->hph_type = WCD_MBHC_HPH_MONO; mbhc->hph_type = WCD_MBHC_HPH_MONO;
} }
/* Enable surge protection again after impedance detection */
regmap_update_bits(wcd937x->regmap,
WCD937X_HPH_SURGE_HPHLR_SURGE_EN, 0xC0, 0xC0);
zdet_complete: zdet_complete:
snd_soc_component_write(component, WCD937X_ANA_MBHC_BTN5, reg0); snd_soc_component_write(component, WCD937X_ANA_MBHC_BTN5, reg0);
snd_soc_component_write(component, WCD937X_ANA_MBHC_BTN6, reg1); snd_soc_component_write(component, WCD937X_ANA_MBHC_BTN6, reg1);

9
asoc/codecs/wcd938x/wcd938x-mbhc.c
View File

@@ -547,6 +547,12 @@ static void wcd938x_wcd_mbhc_calc_impedance(struct wcd_mbhc *mbhc, uint32_t *zl,
regmap_update_bits(wcd938x->regmap, regmap_update_bits(wcd938x->regmap,
WCD938X_ANA_MBHC_MECH, 0x01, 0x00); WCD938X_ANA_MBHC_MECH, 0x01, 0x00);
/* Disable surge protection before impedance detection.
* This is done to give correct value for high impedance.
*/
regmap_update_bits(wcd938x->regmap,
WCD938X_HPH_SURGE_HPHLR_SURGE_EN, 0xC0, 0x00);
/* First get impedance on Left */ /* First get impedance on Left */
d1 = d1_a[1]; d1 = d1_a[1];
zdet_param_ptr = &zdet_param[1]; zdet_param_ptr = &zdet_param[1];
@@ -656,6 +662,9 @@ right_ch_impedance:
mbhc->hph_type = WCD_MBHC_HPH_MONO; mbhc->hph_type = WCD_MBHC_HPH_MONO;
} }
/* Enable surge protection again after impedance detection */
regmap_update_bits(wcd938x->regmap,
WCD938X_HPH_SURGE_HPHLR_SURGE_EN, 0xC0, 0xC0);
zdet_complete: zdet_complete:
snd_soc_component_write(component, WCD938X_ANA_MBHC_BTN5, reg0); snd_soc_component_write(component, WCD938X_ANA_MBHC_BTN5, reg0);
snd_soc_component_write(component, WCD938X_ANA_MBHC_BTN6, reg1); snd_soc_component_write(component, WCD938X_ANA_MBHC_BTN6, reg1);