From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753882AbcLIKsE (ORCPT ); Fri, 9 Dec 2016 05:48:04 -0500 Received: from mail-wj0-f180.google.com ([209.85.210.180]:34330 "EHLO mail-wj0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752199AbcLIKsC (ORCPT ); Fri, 9 Dec 2016 05:48:02 -0500 Date: Fri, 9 Dec 2016 10:51:17 +0000 From: Lee Jones To: Charles Keepax Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Subject: Re: [PATCH 3/4] mfd: arizona: Add defines for IRQs on the main Arizona IRQ domain Message-ID: <20161209105117.GI3625@dell.home> References: <1479831028-28500-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1479831028-28500-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1479831028-28500-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Nov 2016, Charles Keepax wrote: > Signed-off-by: Charles Keepax > --- > drivers/mfd/arizona-irq.c | 21 +++++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) Applied for v4.11, thanks. > 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); > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog