From: Lee Jones <lee.jones@linaro.org>
To: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
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
Date: Fri, 9 Dec 2016 10:51:17 +0000 [thread overview]
Message-ID: <20161209105117.GI3625@dell.home> (raw)
In-Reply-To: <1479831028-28500-3-git-send-email-ckeepax@opensource.wolfsonmicro.com>
On Tue, 22 Nov 2016, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> 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
next prev parent reply other threads:[~2016-12-09 10:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 16:10 [PATCH v2 1/4] mfd: arizona: Disable IRQs during driver remove Charles Keepax
2016-11-22 16:10 ` [PATCH v2 2/4] mfd: arizona: Use arizona_map_irq instead of hard coding it Charles Keepax
2016-12-09 10:50 ` Lee Jones
2016-11-22 16:10 ` [PATCH 3/4] mfd: arizona: Add defines for IRQs on the main Arizona IRQ domain Charles Keepax
2016-12-09 10:51 ` Lee Jones [this message]
2016-11-22 16:10 ` [PATCH v4 4/4] mfd: arizona: Correctly clean up after IRQs Charles Keepax
2016-12-09 10:57 ` Lee Jones
2016-12-09 9:30 ` [PATCH v2 1/4] mfd: arizona: Disable IRQs during driver remove 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=20161209105117.GI3625@dell.home \
--to=lee.jones@linaro.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@opensource.wolfsonmicro.com \
/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