From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754862AbaJVIql (ORCPT ); Wed, 22 Oct 2014 04:46:41 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:30170 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754480AbaJVIpv (ORCPT ); Wed, 22 Oct 2014 04:45:51 -0400 X-AuditID: cbfec7f4-b7f6c6d00000120b-1a-54476ebd1b8e 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 Subject: [PATCH RESEND 2/3] extcon: max77693: Request only specific interrupts Date: Wed, 22 Oct 2014 10:45:39 +0200 Message-id: <1413967540-27626-2-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1413967540-27626-1-git-send-email-k.kozlowski@samsung.com> References: <1413967540-27626-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t/xq7p789xDDC7eEbHYOGM9q8X1L89Z LV6/MLQ42/SG3eL+16OMFpd3zWGzWHvkLrvF7cYVbBanu1kdOD3uXNvD5jHvZKBH35ZVjB6f N8kFsERx2aSk5mSWpRbp2yVwZWxfUlmwQaxi0b7/zA2MD4S6GDk5JARMJBo7brJD2GISF+6t Z+ti5OIQEljKKPFi4hwmCKePSeLK8S5WkCo2AWOJzcuXgFWJCOxmlPi2dxFYFbPAUUaJ6b1v mUCqhAX8JDYd+sUIYrMIqErceH+VDcTmFXCX2HJyBdQ+OYmTxyaDTeUU8JBYeOwYUD0H0Dp3 iYNzRScw8i5gZFjFKJpamlxQnJSea6hXnJhbXJqXrpecn7uJERJaX3YwLj5mdYhRgINRiYd3 Bod7iBBrYllxZe4hRgkOZiUR3nvpQCHelMTKqtSi/Pii0pzU4kOMTBycUg2MMRty2r8LTpuq 7MIV3GIplfRXTHfhtvBHkwIusQdO+9V6/O7P78W5qf3hf3SVq02itrisub5jrqxFqryrweNF h9zmC+lezpunxNIp5ikWmbAzsFQx8G1W5wGb/rrZLkXTy+v2WGyyafeMEMhj3np0hqdvw5ru +D/l2z7Kn5pw//qPmfWrq1iUWIozEg21mIuKEwF+nukICwIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver was requesting all MUIC interrupts but then was masking most of them manually at end of probe (with default_init_data). Since default_init_data cannot be passed through DTS (no bindings for driver), this was a conflicting behavior. First get everything, then mask what we don't want. This could change after adding DTS bindings for requesting specific MUIC interrupts. Until then driver should request only these MUIC interrupts which he is really interested in. The commit does not introduce any functional change when the driver is used with DTS (no platform data). However this changes the behavior with platform data supplied. In such case the driver will request only 3 interrupts (ADC, ADC1K, ChgTyp). Platform data could still unmask other interrupts but they won't be handled by the driver. Signed-off-by: Krzysztof Kozlowski --- drivers/extcon/extcon-max77693.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/drivers/extcon/extcon-max77693.c b/drivers/extcon/extcon-max77693.c index 863d088c9bdd..9d21e75a7032 100644 --- a/drivers/extcon/extcon-max77693.c +++ b/drivers/extcon/extcon-max77693.c @@ -44,19 +44,6 @@ static struct max77693_reg_data default_init_data[] = { .addr = MAX77693_MUIC_REG_STATUS2, .data = STATUS2_CHGDETRUN_MASK, }, { - /* INTMASK1 - Unmask [3]ADC1KM,[0]ADCM */ - .addr = MAX77693_MUIC_REG_INTMASK1, - .data = INTMASK1_ADC1K_MASK - | INTMASK1_ADC_MASK, - }, { - /* INTMASK2 - Unmask [0]ChgTypM */ - .addr = MAX77693_MUIC_REG_INTMASK2, - .data = INTMASK2_CHGTYP_MASK, - }, { - /* INTMASK3 - Mask all of interrupts */ - .addr = MAX77693_MUIC_REG_INTMASK3, - .data = 0x0, - }, { /* CDETCTRL2 */ .addr = MAX77693_MUIC_REG_CDETCTRL2, .data = CDETCTRL2_VIDRMEN_MASK @@ -135,21 +122,8 @@ struct max77693_muic_irq { static struct max77693_muic_irq muic_irqs[] = { { MAX77693_MUIC_IRQ_INT1_ADC, "muic-ADC" }, - { MAX77693_MUIC_IRQ_INT1_ADC_LOW, "muic-ADCLOW" }, - { MAX77693_MUIC_IRQ_INT1_ADC_ERR, "muic-ADCError" }, { MAX77693_MUIC_IRQ_INT1_ADC1K, "muic-ADC1K" }, { MAX77693_MUIC_IRQ_INT2_CHGTYP, "muic-CHGTYP" }, - { MAX77693_MUIC_IRQ_INT2_CHGDETREUN, "muic-CHGDETREUN" }, - { MAX77693_MUIC_IRQ_INT2_DCDTMR, "muic-DCDTMR" }, - { MAX77693_MUIC_IRQ_INT2_DXOVP, "muic-DXOVP" }, - { MAX77693_MUIC_IRQ_INT2_VBVOLT, "muic-VBVOLT" }, - { MAX77693_MUIC_IRQ_INT2_VIDRM, "muic-VIDRM" }, - { MAX77693_MUIC_IRQ_INT3_EOC, "muic-EOC" }, - { MAX77693_MUIC_IRQ_INT3_CGMBC, "muic-CGMBC" }, - { MAX77693_MUIC_IRQ_INT3_OVP, "muic-OVP" }, - { MAX77693_MUIC_IRQ_INT3_MBCCHG_ERR, "muic-MBCCHG_ERR" }, - { MAX77693_MUIC_IRQ_INT3_CHG_ENABLED, "muic-CHG_ENABLED" }, - { MAX77693_MUIC_IRQ_INT3_BAT_DET, "muic-BAT_DET" }, }; /* Define supported accessory type */ -- 1.9.1