All of lore.kernel.org
 help / color / mirror / Atom feed
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 8/9] extcon: arizona: Use the micd_clamp for interrupts if it is available
Date: Wed, 16 Sep 2015 10:42:20 +0100	[thread overview]
Message-ID: <1442396541-7145-9-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1442396541-7145-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>

Currently we only use the microphone clamp IRQ if GPIO5 is being used as
a second jack detection pin. But we should be using it on any system
where the clamp is available. This patch updates the driver to do so.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/extcon/extcon-arizona.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index ece5892..9255c1f 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -1057,7 +1057,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data)
 
 	mutex_lock(&info->lock);
 
-	if (arizona->pdata.jd_gpio5) {
+	if (info->micd_clamp) {
 		mask = ARIZONA_MICD_CLAMP_STS;
 		present = 0;
 	} else {
@@ -1504,7 +1504,7 @@ static int arizona_extcon_probe(struct platform_device *pdev)
 	pm_runtime_idle(&pdev->dev);
 	pm_runtime_get_sync(&pdev->dev);
 
-	if (arizona->pdata.jd_gpio5) {
+	if (info->micd_clamp) {
 		jack_irq_rise = ARIZONA_IRQ_MICD_CLAMP_RISE;
 		jack_irq_fall = ARIZONA_IRQ_MICD_CLAMP_FALL;
 	} else {
@@ -1609,7 +1609,7 @@ static int arizona_extcon_remove(struct platform_device *pdev)
 			   ARIZONA_MICD_CLAMP_CONTROL,
 			   ARIZONA_MICD_CLAMP_MODE_MASK, 0);
 
-	if (arizona->pdata.jd_gpio5) {
+	if (info->micd_clamp) {
 		jack_irq_rise = ARIZONA_IRQ_MICD_CLAMP_RISE;
 		jack_irq_fall = ARIZONA_IRQ_MICD_CLAMP_FALL;
 	} else {
-- 
1.7.2.5


  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 ` [PATCH 6/9] extcon: arizona: Additional settings to improve accuracy of HP detect Charles Keepax
2015-09-16  9:42 ` [PATCH 7/9] extcon: arizona: Ignore jd_invert for MICD_CLAMP_STS Charles Keepax
2015-09-16  9:42 ` Charles Keepax [this message]
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-9-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.