From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 02/16] extcon: arizona: Attempt more microphone measurements
Date: Tue, 2 Apr 2013 12:32:34 +0100 [thread overview]
Message-ID: <1364902368-1123-2-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1364902368-1123-1-git-send-email-broonie@opensource.wolfsonmicro.com>
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: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index b289279..4bb0e9a 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -153,6 +153,8 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode)
{
struct arizona *arizona = info->arizona;
+ mode %= info->num_micd_modes;
+
if (arizona->pdata.micd_pol_gpio > 0)
gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio,
info->micd_modes[mode].gpio);
@@ -783,7 +785,7 @@ static irqreturn_t arizona_micdet(int irq, void *data)
* impedence then give up and report headphones.
*/
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");
arizona_identify_headphone(info);
--
1.7.10.4
next prev parent reply other threads:[~2013-04-02 11:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 11:31 [PATCH 0/16] extcon: arizona: Updates for v3.10 Mark Brown
2013-04-02 11:32 ` [PATCH 01/16] mfd: wm5102: Add registers for microphone detection level configuration Mark Brown
2013-04-02 11:32 ` Mark Brown [this message]
2013-04-02 11:32 ` [PATCH 03/16] extcon: arizona: Allow configuration of button detection Mark Brown
2013-04-02 11:32 ` [PATCH 04/16] extcon: arizona: Don't pulse MICBIAS for HPDET identification Mark Brown
2013-04-02 11:32 ` [PATCH 05/16] extcon: arizona: Allow pull to be disabled on GPIO5 when used for JACKET Mark Brown
2013-04-02 11:32 ` [PATCH 06/16] extcon: arizona: Raise minimum microphone impedance for HPDET method Mark Brown
2013-04-02 11:32 ` [PATCH 07/16] extcon: arizona: Suppress duplicate JACKDET reports Mark Brown
2013-04-02 11:32 ` [PATCH 08/16] extcon: arizona: Check we report a valid impedance Mark Brown
2013-04-02 11:32 ` [PATCH 09/16] extcon: arizona: Tune up HPDET debounce Mark Brown
2013-04-02 11:32 ` [PATCH 10/16] extcon: arizona: Retry HPDET identification for high impedance Mark Brown
2013-04-02 11:32 ` [PATCH 11/16] extcon: arizona: Don't ground flip when using HPDET identification Mark Brown
2013-04-02 11:32 ` [PATCH 12/16] extcon: arizona: Simplify HPDET based identification Mark Brown
2013-04-02 11:32 ` [PATCH 13/16] extcon: arizona: Time out if MICDET fails to report Mark Brown
2013-04-02 11:32 ` [PATCH 14/16] extcon: arizona: Clear existing button reports before reporting new one Mark Brown
2013-04-02 11:32 ` [PATCH 15/16] extcon: arizona: Allow additional debounce during microphone detection Mark Brown
2013-04-02 11:32 ` [PATCH 16/16] extcon: arizona: Make mic detection timeout configurable Mark Brown
2013-04-03 18:33 ` [PATCH 0/16] extcon: arizona: Updates for v3.10 Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364902368-1123-2-git-send-email-broonie@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox