From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbaJJIWg (ORCPT ); Fri, 10 Oct 2014 04:22:36 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:35770 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751389AbaJJIWS (ORCPT ); Fri, 10 Oct 2014 04:22:18 -0400 X-AuditID: cbfec7f4-b7f156d0000063c7-b2-5437973627ab From: Krzysztof Kozlowski To: MyungJoo Ham , Chanwoo Choi , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org Cc: Kyungmin Park , Marek Szyprowski , Bartlomiej Zolnierkiewicz , Krzysztof Kozlowski , 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 Message-id: <1412929322-21908-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1412929322-21908-1-git-send-email-k.kozlowski@samsung.com> References: <1412929322-21908-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLJMWRmVeSWpSXmKPExsVy+t/xa7pm081DDObv0LXYOGM9q8X1L89Z LV6/MLQ42/SG3eL+16OMFpd3zWGzWHvkLrvF7cYVbBanu1ktFmx8xOjA5XHn2h42j3knAz36 tqxi9Pi8SS6AJYrLJiU1J7MstUjfLoErY9u7/awFW4QrFvZXNzD+4+9i5OSQEDCR+Ll/FyOE LSZx4d56ti5GLg4hgaWMEpO6z0A5fUwSF2f/YAapYhMwlti8fAlYQkRgN6PEt72LmEAcZoG7 jBLNd9+DzRIW8JPY/LmPtYuRg4NFQFXieo8MSJhXwF2i9eINdoh1chInj01mBbE5BTwk9i49 BWYLAdXcPXKPbQIj7wJGhlWMoqmlyQXFSem5hnrFibnFpXnpesn5uZsYIUH2ZQfj4mNWhxgF OBiVeHgvyJiHCLEmlhVX5h5ilOBgVhLh1TcFCvGmJFZWpRblxxeV5qQWH2Jk4uCUamCMnxax 8teP0w/vmfaJm6ROzWTXypq7eGb55ZIfp1+KKn85VRwVVjPD3Fl31tR4//JtjQL35FN+yD/7 4Kv/jFvP4HKw+mftgqea014b/eq3rD/XZ3/kfI/p76ADV2U2yt3Z9tZe4NTdk3MOm57xP7dB 87bp9zeVfdmMy+L2bw+qb7+ja6xpVWKnxFKckWioxVxUnAgAHhpMmhACAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: 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