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

Merge "ASoC: wcd937x: Reduce latency in case of impedance detection"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-09-19 22:52:46 -07:00
committed by Gerrit - the friendly Code Review server
parent c223ed77f3 34b5181903
commit 884e5ee2e5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -415,8 +415,10 @@ static inline void wcd937x_mbhc_get_result_params(struct wcd937x_priv *wcd937x,
ramp_down: ramp_down:
i = 0; i = 0;
while (x1) { while (x1) {
regmap_bulk_read(wcd937x->regmap, regmap_read(wcd937x->regmap, WCD937X_ANA_MBHC_RESULT_1, &val);
WCD937X_ANA_MBHC_RESULT_1, (u8 *)&val, 2); regmap_read(wcd937x->regmap, WCD937X_ANA_MBHC_RESULT_2, &val1);
val = val << 0x8;
val |= val1;
x1 = WCD937X_MBHC_GET_X1(val); x1 = WCD937X_MBHC_GET_X1(val);
i++; i++;
if (i == WCD937X_ZDET_NUM_MEASUREMENTS) if (i == WCD937X_ZDET_NUM_MEASUREMENTS)
@@ -974,7 +976,7 @@ int wcd937x_mbhc_post_ssr_init(struct wcd937x_mbhc *mbhc,
wcd_mbhc_deinit(wcd_mbhc); wcd_mbhc_deinit(wcd_mbhc);
ret = wcd_mbhc_init(wcd_mbhc, codec, &mbhc_cb, &intr_ids, ret = wcd_mbhc_init(wcd_mbhc, codec, &mbhc_cb, &intr_ids,
wcd_mbhc_registers, false); wcd_mbhc_registers, WCD937X_ZDET_SUPPORTED);
if (ret) { if (ret) {
dev_err(codec->dev, "%s: mbhc initialization failed\n", dev_err(codec->dev, "%s: mbhc initialization failed\n",
__func__); __func__);
@@ -1026,7 +1028,7 @@ int wcd937x_mbhc_init(struct wcd937x_mbhc **mbhc, struct snd_soc_codec *codec,
ret = wcd_mbhc_init(wcd_mbhc, codec, &mbhc_cb, ret = wcd_mbhc_init(wcd_mbhc, codec, &mbhc_cb,
&intr_ids, wcd_mbhc_registers, &intr_ids, wcd_mbhc_registers,
false); WCD937X_ZDET_SUPPORTED);
if (ret) { if (ret) {
dev_err(codec->dev, "%s: mbhc initialization failed\n", dev_err(codec->dev, "%s: mbhc initialization failed\n",
__func__); __func__);