From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
To: MyungJoo Ham <myungjoo.ham@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
linux-kernel@vger.kernel.org
Cc: Kyungmin Park <kyungmin.park@samsung.com>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
stable@vger.kernel.org
Subject: [PATCH fixes 2/2] extcon: max77693: Fix always masked MUIC interrupts
Date: Fri, 10 Oct 2014 10:22:02 +0200 [thread overview]
Message-ID: <1412929322-21908-2-git-send-email-k.kozlowski@samsung.com> (raw)
In-Reply-To: <1412929322-21908-1-git-send-email-k.kozlowski@samsung.com>
All interrupts coming from MUIC were ignored because interrupt source
register was masked.
The Maxim 77693 has a "interrupt source" - a separate register and interrupts
which give information about PMIC block triggering the individual
interrupt (charger, topsys, MUIC, flash LED).
By default bootloader could initialize this register to "mask all"
value. In such case (observed on Trats2 board) MUIC interrupts won't be
generated regardless of their mask status. Regmap irq chip was unmasking
individual MUIC interrupts but the source was masked
Before introducing regmap irq chip this interrupt source was unmasked,
read and acked. Reading and acking is not necessary but unmasking is. Do
it in extcon driver.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: <stable@vger.kernel.org>
Fixes: 342d669c1ee4 ("mfd: max77693: Handle IRQs using regmap")
---
drivers/extcon/extcon-max77693.c | 16 ++++++++++++++++
include/linux/mfd/max77693-private.h | 5 +++++
2 files changed, 21 insertions(+)
diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c
index 490e27475bac..d3adacf3187f 100644
--- a/drivers/extcon/extcon-max77693.c
+++ b/drivers/extcon/extcon-max77693.c
@@ -1176,6 +1176,22 @@ static int max77693_muic_probe(struct platform_device *pdev)
}
}
+ if (i) {
+ /*
+ * i>0, at least one MUIC interrupt requested so need to unmask
+ * MUIC interrupt in INTSRC register. Without that MUIC
+ * interrupts will not be reported.
+ */
+ ret = regmap_update_bits(max77693->regmap,
+ MAX77693_PMIC_REG_INTSRC_MASK, SRC_IRQ_MUIC,
+ ~SRC_IRQ_MUIC);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Could not unmask MUIC interrupt in INTSRC: %d\n",
+ ret);
+ return ret;
+ }
+ }
+
/* Initialize extcon device */
info->edev = devm_extcon_dev_allocate(&pdev->dev,
max77693_extcon_cable);
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index e1b2b61285b9..4f1a80b66ecf 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -438,6 +438,11 @@ enum max77693_irq_source {
MAX77693_IRQ_GROUP_NR,
};
+#define SRC_IRQ_CHARGER BIT(0)
+#define SRC_IRQ_TOP BIT(1)
+#define SRC_IRQ_FLASH BIT(2)
+#define SRC_IRQ_MUIC BIT(3)
+
#define LED_IRQ_FLED2_OPEN BIT(0)
#define LED_IRQ_FLED2_SHORT BIT(1)
#define LED_IRQ_FLED1_OPEN BIT(2)
--
1.9.1
next prev parent reply other threads:[~2014-10-10 8:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-10 8:22 [PATCH fixes 1/2] mfd: max77693: Use proper regmap for handling " Krzysztof Kozlowski
2014-10-10 8:22 ` Krzysztof Kozlowski [this message]
2014-10-10 8:45 ` [PATCH fixes 2/2] extcon: max77693: Fix always masked " Chanwoo Choi
2014-10-10 9:03 ` Krzysztof Kozlowski
2014-10-10 10:05 ` Chanwoo Choi
2014-10-10 10:10 ` Krzysztof Kozlowski
2014-10-10 8:58 ` Lee Jones
2014-10-10 9:01 ` Krzysztof Kozlowski
2014-10-10 9:48 ` Lee Jones
2014-10-10 10:08 ` Krzysztof Kozlowski
2014-10-10 8:46 ` [PATCH fixes 1/2] mfd: max77693: Use proper regmap for handling " Chanwoo Choi
2014-10-10 8:55 ` Lee Jones
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=1412929322-21908-2-git-send-email-k.kozlowski@samsung.com \
--to=k.kozlowski@samsung.com \
--cc=b.zolnierkie@samsung.com \
--cc=cw00.choi@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=myungjoo.ham@samsung.com \
--cc=sameo@linux.intel.com \
--cc=stable@vger.kernel.org \
/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®