Commit 84eaa136 authored by Mark Brown's avatar Mark Brown

extcon: arizona: Attempt more microphone measurements

In some pathological use cases users may insert an accessory very slowly
causing multiple indeterminate measurements. Handle this by retrying many
measurements before we give up and declare a headphone.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 253b5374
...@@ -153,6 +153,8 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode) ...@@ -153,6 +153,8 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)
{ {
struct arizona *arizona = info->arizona; struct arizona *arizona = info->arizona;
mode %= info->num_micd_modes;
if (arizona->pdata.micd_pol_gpio > 0) if (arizona->pdata.micd_pol_gpio > 0)
gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio, gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio,
info->micd_modes[mode].gpio); info->micd_modes[mode].gpio);
...@@ -783,7 +785,7 @@ static irqreturn_t arizona_micdet(int irq, void *data) ...@@ -783,7 +785,7 @@ static irqreturn_t arizona_micdet(int irq, void *data)
* impedence then give up and report headphones. * impedence then give up and report headphones.
*/ */
if (info->detecting && (val & 0x3f8)) { if (info->detecting && (val & 0x3f8)) {
if (info->jack_flips >= info->micd_num_modes) { if (info->jack_flips >= info->micd_num_modes * 10) {
dev_dbg(arizona->dev, "Detected HP/line\n"); dev_dbg(arizona->dev, "Detected HP/line\n");
arizona_identify_headphone(info); arizona_identify_headphone(info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment