From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Chanwoo Choi <cw00.choi@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>
Cc: linux-kernel@vger.kernel.org,
patches@opensource.wolfsonmicro.com,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [PATCH 10/11] extcon: arizona: Always take the first HPDET reading as the final one
Date: Mon, 11 Feb 2013 16:27:05 +0000 [thread overview]
Message-ID: <1360600026-16878-10-git-send-email-broonie@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1360600026-16878-1-git-send-email-broonie@opensource.wolfsonmicro.com>
This should always be the most accurate reading for supported accessory
configurations.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index aeaf217..d991842 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -451,6 +451,10 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading)
info->hpdet_res[0], info->hpdet_res[1],
info->hpdet_res[2]);
+
+ /* Take the headphone impedance for the main report */
+ *reading = info->hpdet_res[0];
+
/*
* Either the two grounds measure differently or we
* measure the mic as high impedance.
@@ -466,9 +470,6 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info *info, int *reading)
dev_err(arizona->dev,
"Failed to report mic: %d\n", ret);
}
-
- /* Take the headphone impedance for the main report */
- *reading = info->hpdet_res[1];
} else {
dev_dbg(arizona->dev, "Detected headphone\n");
}
--
1.7.10.4
next prev parent reply other threads:[~2013-02-11 16:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 16:26 [PATCH 00/11] extcon-arizona updates Mark Brown
2013-02-11 16:26 ` [PATCH 01/11] extcon: arizona: Disable debouce for accessory removal detection Mark Brown
2013-02-11 16:26 ` [PATCH 02/11] extcon: arizona: Retry failed HP measurements Mark Brown
2013-02-11 16:26 ` [PATCH 03/11] extcon: arizona: Remove duplicate rate configuration Mark Brown
2013-02-11 16:26 ` [PATCH 04/11] extcon: arizona: Support additional configuration of microphone detection Mark Brown
2013-02-11 16:27 ` [PATCH 05/11] extcon: arizona: Use regulated mode for microphone supply when detecting Mark Brown
2013-02-11 16:27 ` [PATCH 06/11] extcon: arizona: Remove extra jack flip increment Mark Brown
2013-02-11 16:27 ` [PATCH 07/11] extcon: arizona: Add some debounce time before starting HPDET identification Mark Brown
2013-02-11 16:27 ` [PATCH 08/11] extcon: arizona: Don't HPDET magic when headphones are enabled Mark Brown
2013-02-11 16:27 ` [PATCH 09/11] extcon: arizona: Clear _trig_sts bits after jack detection Mark Brown
2013-02-11 16:27 ` Mark Brown [this message]
2013-02-11 16:27 ` [PATCH 11/11] extcon: arizona: Use MICDET for final microphone identification Mark Brown
2013-02-11 21:45 ` [PATCH 00/11] extcon-arizona updates 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=1360600026-16878-10-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
all inboxes | Powered by JetHome®