From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756000AbcKVQJ6 (ORCPT ); Tue, 22 Nov 2016 11:09:58 -0500 Received: from mx0a-001ae601.pphosted.com ([67.231.149.25]:39830 "EHLO mx0b-001ae601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755329AbcKVQJ4 (ORCPT ); Tue, 22 Nov 2016 11:09:56 -0500 Authentication-Results: ppops.net; spf=none smtp.mailfrom=ckeepax@opensource.wolfsonmicro.com From: Charles Keepax To: CC: , Subject: [PATCH 3/4] mfd: arizona: Add defines for IRQs on the main Arizona IRQ domain Date: Tue, 22 Nov 2016 16:10:27 +0000 Message-ID: <1479831028-28500-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1479831028-28500-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> References: <1479831028-28500-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611220287 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Charles Keepax --- drivers/mfd/arizona-irq.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/arizona-irq.c b/drivers/mfd/arizona-irq.c index 724fa54..88729cf 100644 --- a/drivers/mfd/arizona-irq.c +++ b/drivers/mfd/arizona-irq.c @@ -26,6 +26,9 @@ #include "arizona.h" +#define ARIZONA_AOD_IRQ_INDEX 0 +#define ARIZONA_MAIN_IRQ_INDEX 1 + static int arizona_map_irq(struct arizona *arizona, int irq) { int ret; @@ -319,7 +322,8 @@ int arizona_irq_init(struct arizona *arizona) if (aod) { ret = regmap_add_irq_chip(arizona->regmap, - irq_create_mapping(arizona->virq, 0), + irq_create_mapping(arizona->virq, + ARIZONA_AOD_IRQ_INDEX), IRQF_ONESHOT, 0, aod, &arizona->aod_irq_chip); if (ret != 0) { @@ -330,7 +334,8 @@ int arizona_irq_init(struct arizona *arizona) } ret = regmap_add_irq_chip(arizona->regmap, - irq_create_mapping(arizona->virq, 1), + irq_create_mapping(arizona->virq, + ARIZONA_MAIN_IRQ_INDEX), IRQF_ONESHOT, 0, irq, &arizona->irq_chip); if (ret != 0) { @@ -396,10 +401,12 @@ int arizona_irq_init(struct arizona *arizona) err_boot_done: free_irq(arizona->irq, arizona); err_main_irq: - regmap_del_irq_chip(irq_find_mapping(arizona->virq, 1), + regmap_del_irq_chip(irq_find_mapping(arizona->virq, + ARIZONA_MAIN_IRQ_INDEX), arizona->irq_chip); err_aod: - regmap_del_irq_chip(irq_find_mapping(arizona->virq, 0), + regmap_del_irq_chip(irq_find_mapping(arizona->virq, + ARIZONA_AOD_IRQ_INDEX), arizona->aod_irq_chip); err: return ret; @@ -411,9 +418,11 @@ int arizona_irq_exit(struct arizona *arizona) arizona_free_irq(arizona, ARIZONA_IRQ_CTRLIF_ERR, arizona); arizona_free_irq(arizona, ARIZONA_IRQ_BOOT_DONE, arizona); - regmap_del_irq_chip(irq_find_mapping(arizona->virq, 1), + regmap_del_irq_chip(irq_find_mapping(arizona->virq, + ARIZONA_MAIN_IRQ_INDEX), arizona->irq_chip); - regmap_del_irq_chip(irq_find_mapping(arizona->virq, 0), + regmap_del_irq_chip(irq_find_mapping(arizona->virq, + ARIZONA_AOD_IRQ_INDEX), arizona->aod_irq_chip); free_irq(arizona->irq, arizona); -- 2.1.4