DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ASoC: msm8960: Fix mbhc multi button detection" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2012-04-23 19:33:07 -07:00
committed by QuIC Gerrit Code Review
parent 59bd848ae8 fee1743069
commit cc2fcd7125
2 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
sound/soc/codecs/wcd9310.c
View File

@@ -5427,8 +5427,9 @@ static bool tabla_mbhc_fw_validate(const struct firmware *fw)
return true;
}
/* called under codec_resource_lock acquisition */
static int tabla_determine_button(const struct tabla_priv *priv,
const s32 bias_mv)
const s32 micmv)
{
s16 *v_btn_low, *v_btn_high;
struct tabla_mbhc_btn_detect_cfg *btn_det;
@@ -5438,8 +5439,9 @@ static int tabla_determine_button(const struct tabla_priv *priv,
v_btn_low = tabla_mbhc_cal_btn_det_mp(btn_det, TABLA_BTN_DET_V_BTN_LOW);
v_btn_high = tabla_mbhc_cal_btn_det_mp(btn_det,
TABLA_BTN_DET_V_BTN_HIGH);
for (i = 0; i < btn_det->num_btn; i++) {
if ((v_btn_low[i] <= bias_mv) && (v_btn_high[i] >= bias_mv)) {
if ((v_btn_low[i] <= micmv) && (v_btn_high[i] >= micmv)) {
btn = i;
break;
}
@@ -5447,7 +5449,7 @@ static int tabla_determine_button(const struct tabla_priv *priv,
if (btn == -1)
pr_debug("%s: couldn't find button number for mic mv %d\n",
__func__, bias_mv);
__func__, micmv);
return btn;
}
@@ -5487,8 +5489,9 @@ static int tabla_get_button_mask(const int btn)
static irqreturn_t tabla_dce_handler(int irq, void *data)
{
int i, mask;
short dce, sta, bias_value_dce;
s32 mv, stamv, bias_mv_dce;
short dce, sta;
s32 mv, mv_s, stamv_s;
bool vddio;
int btn = -1, meas = 0;
struct tabla_priv *priv = data;
const struct tabla_mbhc_btn_detect_cfg *d =
@@ -5527,6 +5530,10 @@ static irqreturn_t tabla_dce_handler(int irq, void *data)
goto done;
}
vddio = (priv->mbhc_data.micb_mv != VDDIO_MICBIAS_MV &&
priv->mbhc_micbias_switched);
mv_s = vddio ? tabla_scale_v_micb_vddio(priv, mv, false) : mv;
if (mbhc_status != TABLA_MBHC_STATUS_REL_DETECTION) {
if (priv->mbhc_last_resume &&
!time_after(jiffies, priv->mbhc_last_resume + HZ)) {
@@ -5537,27 +5544,32 @@ static irqreturn_t tabla_dce_handler(int irq, void *data)
pr_debug("%s: Button is already released without "
"resume", __func__);
sta = tabla_codec_read_sta_result(codec);
stamv = tabla_codec_sta_dce_v(codec, 0, sta);
btn = tabla_determine_button(priv, mv);
if (btn != tabla_determine_button(priv, stamv))
stamv_s = tabla_codec_sta_dce_v(codec, 0, sta);
if (vddio)
stamv_s = tabla_scale_v_micb_vddio(priv,
stamv_s,
false);
btn = tabla_determine_button(priv, mv_s);
if (btn != tabla_determine_button(priv, stamv_s))
btn = -1;
goto done;
}
}
/* determine pressed button */
btnmeas[meas++] = tabla_determine_button(priv, mv);
pr_debug("%s: meas %d - DCE %d,%d, button %d\n", __func__,
meas - 1, dce, mv, btnmeas[meas - 1]);
btnmeas[meas++] = tabla_determine_button(priv, mv_s);
pr_debug("%s: meas %d - DCE %d,%d,%d button %d\n", __func__,
meas - 1, dce, mv, mv_s, btnmeas[meas - 1]);
if (n_btn_meas == 0)
btn = btnmeas[0];
for (; ((d->n_btn_meas) && (meas < (d->n_btn_meas + 1))); meas++) {
bias_value_dce = tabla_codec_sta_dce(codec, 1, false);
bias_mv_dce = tabla_codec_sta_dce_v(codec, 1, bias_value_dce);
btnmeas[meas] = tabla_determine_button(priv, bias_mv_dce);
pr_debug("%s: meas %d - DCE %d,%d, button %d\n",
__func__, meas, bias_value_dce, bias_mv_dce,
btnmeas[meas]);
dce = tabla_codec_sta_dce(codec, 1, false);
mv = tabla_codec_sta_dce_v(codec, 1, dce);
mv_s = vddio ? tabla_scale_v_micb_vddio(priv, mv, false) : mv;
btnmeas[meas] = tabla_determine_button(priv, mv_s);
pr_debug("%s: meas %d - DCE %d,%d,%d button %d\n",
__func__, meas, dce, mv, mv_s, btnmeas[meas]);
/* if large enough measurements are collected,
* start to check if last all n_btn_con measurements were
* in same button low/high range */

30
sound/soc/msm/msm8960.c
View File

@@ -649,21 +649,21 @@ static void *def_tabla_mbhc_cal(void)
btn_low = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_LOW);
btn_high = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_V_BTN_HIGH);
btn_low[0] = -50;
btn_high[0] = 10;
btn_low[1] = 11;
btn_high[1] = 38;
btn_low[2] = 39;
btn_high[2] = 64;
btn_low[3] = 65;
btn_high[3] = 91;
btn_low[4] = 92;
btn_high[4] = 115;
btn_low[5] = 116;
btn_high[5] = 141;
btn_low[6] = 142;
btn_high[6] = 163;
btn_low[7] = 164;
btn_high[7] = 250;
btn_high[0] = 20;
btn_low[1] = 21;
btn_high[1] = 62;
btn_low[2] = 63;
btn_high[2] = 104;
btn_low[3] = 105;
btn_high[3] = 143;
btn_low[4] = 144;
btn_high[4] = 181;
btn_low[5] = 182;
btn_high[5] = 218;
btn_low[6] = 219;
btn_high[6] = 254;
btn_low[7] = 255;
btn_high[7] = 330;
n_ready = tabla_mbhc_cal_btn_det_mp(btn_cfg, TABLA_BTN_DET_N_READY);
n_ready[0] = 80;
n_ready[1] = 68;