From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: <cw00.choi@samsung.com>, <lee.jones@linaro.org>
Cc: <myungjoo.ham@samsung.com>, <sameo@linux.intel.com>,
<patches@opensource.wolfsonmicro.com>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH 6/9] extcon: arizona: Additional settings to improve accuracy of HP detect
Date: Wed, 16 Sep 2015 10:42:18 +0100 [thread overview]
Message-ID: <1442396541-7145-7-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1442396541-7145-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
If the TST_CAP_SEL bits aren't set correctly on wm5110/8280 there will
be a 100k load along side the headphones, which will affect the accurary
towards the very top of the detection range. This patch sets those bits.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
---
drivers/extcon/extcon-arizona.c | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index d719ee7..6d35147b 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -43,6 +43,9 @@
#define ARIZONA_MICD_CLAMP_MODE_JDL_GP5H 0x9
#define ARIZONA_MICD_CLAMP_MODE_JDH_GP5H 0xb
+#define ARIZONA_TST_CAP_DEFAULT 0x3
+#define ARIZONA_TST_CAP_CLAMP 0x1
+
#define ARIZONA_HPDET_MAX 10000
#define HPDET_DEBOUNCE 500
@@ -147,6 +150,7 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
{
struct arizona *arizona = info->arizona;
unsigned int mask = 0, val = 0;
+ unsigned int cap_sel = 0;
int ret;
switch (arizona->type) {
@@ -154,10 +158,21 @@ static void arizona_extcon_hp_clamp(struct arizona_extcon_info *info,
case WM8280:
mask = ARIZONA_HP1L_SHRTO | ARIZONA_HP1L_FLWR |
ARIZONA_HP1L_SHRTI;
- if (clamp)
+ if (clamp) {
val = ARIZONA_HP1L_SHRTO;
- else
+ cap_sel = ARIZONA_TST_CAP_CLAMP;
+ } else {
val = ARIZONA_HP1L_FLWR | ARIZONA_HP1L_SHRTI;
+ cap_sel = ARIZONA_TST_CAP_DEFAULT;
+ }
+
+ ret = regmap_update_bits(arizona->regmap,
+ ARIZONA_HP_TEST_CTRL_1,
+ ARIZONA_HP1_TST_CAP_SEL_MASK,
+ cap_sel);
+ if (ret != 0)
+ dev_warn(arizona->dev,
+ "Failed to set TST_CAP_SEL: %d\n", ret);
break;
default:
mask = ARIZONA_RMV_SHRT_HP1L;
--
1.7.2.5
next prev parent reply other threads:[~2015-09-16 10:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-16 9:42 [PATCH 0/9] Arizona Extcon Bug Fixes and Improvements Charles Keepax
2015-09-16 9:42 ` [PATCH 1/9] mfd: arizona: Add registers for ADC microphone detection Charles Keepax
2015-09-16 9:42 ` [PATCH 2/9] mfd: arizona: Add register bits for general purpose switch Charles Keepax
2015-09-16 9:42 ` [PATCH 3/9] mfd: arizona: Add TST_CAP bits for headphone detection Charles Keepax
2015-09-20 4:17 ` Lee Jones
2015-09-16 9:42 ` [PATCH 4/9] extcon: arizona: Add support for new ADC value mic detect Charles Keepax
2015-09-16 9:42 ` [PATCH 5/9] extcon: arizona: Add support for general purpose switch Charles Keepax
2015-09-16 9:42 ` Charles Keepax [this message]
2015-09-16 9:42 ` [PATCH 7/9] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax
2015-09-16 9:42 ` [PATCH 8/9] extcon: arizona: Use the micd_clamp for interrupts if it is available Charles Keepax
2015-09-16 9:42 ` [PATCH 9/9] extcon: arizona: Don't disable debounce for inverted jacks Charles Keepax
2015-09-25 0:05 ` [PATCH 0/9] Arizona Extcon Bug Fixes and Improvements Chanwoo Choi
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=1442396541-7145-7-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=cw00.choi@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=sameo@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.