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 11/16] extcon: arizona: Don't ground flip when using HPDET identification
Date: Tue, 2 Apr 2013 12:32:43 +0100 [thread overview]
Message-ID: <1364902368-1123-11-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1364902368-1123-1-git-send-email-broonie@opensource.wolfsonmicro.com>
This extra check makes the procedure take longer and is of marginal use
in identification so do not execute it.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index c18cf14..7c4ce81 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -470,29 +470,7 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading)
*/
if (arizona->pdata.hpdet_acc_id) {
info->hpdet_res[info->num_hpdet_res++] = *reading;
-
- /*
- * If the impedence is too high don't measure the
- * second ground.
- */
- if (info->num_hpdet_res == 1 && *reading >= 45) {
- dev_dbg(arizona->dev, "Skipping ground flip\n");
- info->hpdet_res[info->num_hpdet_res++] = *reading;
- }
-
- if (info->num_hpdet_res == 1) {
- dev_dbg(arizona->dev, "Flipping ground\n");
-
- regmap_update_bits(arizona->regmap,
- ARIZONA_ACCESSORY_DETECT_MODE_1,
- ARIZONA_ACCDET_SRC,
- ~info->micd_modes[0].src);
-
- regmap_update_bits(arizona->regmap,
- ARIZONA_HEADPHONE_DETECT_1,
- ARIZONA_HP_POLL, ARIZONA_HP_POLL);
- return -EAGAIN;
- }
+ info->hpdet_res[info->num_hpdet_res++] = *reading;
/* Only check the mic directly if we didn't already ID it */
if (id_gpio && info->num_hpdet_res == 2 &&
--
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 ` [PATCH 02/16] extcon: arizona: Attempt more microphone measurements Mark Brown
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 ` Mark Brown [this message]
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-11-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