From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: cw00.choi@samsung.com
Cc: myungjoo.ham@samsung.com, sameo@linux.intel.com,
lee.jones@linaro.org, patches@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: [PATCH 5/7] extcon: arizona: Add support for headphone detection on wm5110 rev D
Date: Wed, 13 Nov 2013 18:04:35 +0000 [thread overview]
Message-ID: <1384365877-12355-5-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1384365877-12355-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
wm5110 rev D is the first chip to use headphone detection IP 2, specify
such and make a small correction as the impedance value is actually read
in 0.5 ohm increments now.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
drivers/extcon/extcon-arizona.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index e311c52..d08e342 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -435,6 +435,7 @@ static int arizona_hpdet_read(struct arizona_extcon_info *info)
}
val &= ARIZONA_HP_LVL_B_MASK;
+ val /= 2;
regmap_read(arizona->regmap, ARIZONA_HEADPHONE_DETECT_1,
&range);
@@ -1149,6 +1150,16 @@ static int arizona_extcon_probe(struct platform_device *pdev)
break;
}
break;
+ case WM5110:
+ switch (arizona->rev) {
+ case 0 ... 2:
+ break;
+ default:
+ info->micd_clamp = true;
+ info->hpdet_ip = 2;
+ break;
+ }
+ break;
default:
break;
}
--
1.7.2.5
next prev parent reply other threads:[~2013-11-13 18:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-13 18:04 [PATCH 1/7] extcon: arizona: Add defines for microphone detection levels Charles Keepax
2013-11-13 18:04 ` [PATCH 2/7] extcon: arizona: Fix reset of HPDET after race with removal Charles Keepax
2013-11-13 18:04 ` [PATCH 3/7] extcon: arizona: Fix race with microphone detection and removal Charles Keepax
2013-11-13 18:04 ` [PATCH 4/7] extcon: arizona: No need to switch back down HPDET ranges Charles Keepax
2013-11-13 18:04 ` Charles Keepax [this message]
2013-11-14 12:29 ` [PATCH 5/7] extcon: arizona: Add support for headphone detection on wm5110 rev D Chanwoo Choi
2013-11-13 18:04 ` [PATCH 6/7] extcon: arizona: Factor out different headphone detection IPs Charles Keepax
2013-11-13 18:04 ` [PATCH 7/7] extcon: arizona: Improve headphone detection error handling Charles Keepax
2013-11-14 9:32 ` [PATCH 1/7] extcon: arizona: Add defines for microphone detection levels Lee Jones
2013-11-14 12:38 ` Chanwoo Choi
2013-11-14 14:23 ` Charles Keepax
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=1384365877-12355-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox