From: Nikita Shubin <nikita.shubin@maquefel.me>
To: unlisted-recipients:; (no To-header on input)
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Nikita Shubin <nikita.shubin@maquefel.me>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Alexander Sverdlin <alexander.sverdlin@gmail.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 2/7] gpio: ep93xx: Fix single irqchip with multi gpiochips
Date: Mon, 8 Feb 2021 11:59:49 +0300 [thread overview]
Message-ID: <20210208085954.30050-3-nikita.shubin@maquefel.me> (raw)
In-Reply-To: <20210208085954.30050-1-nikita.shubin@maquefel.me>
Fixes the following warnings which results in interrupts disabled on
port B/F:
gpio gpiochip1: (B): detected irqchip that is shared with multiple gpiochips: please fix the driver.
gpio gpiochip5: (F): detected irqchip that is shared with multiple gpiochips: please fix the driver.
- added separate irqchip for each interrupt capable gpiochip
- provided unique names for each irqchip
Fixes: d2b091961510 ("gpio: ep93xx: Pass irqchip when adding gpiochip")
Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
v4->v5:
- generate IRQ chip's names dynamicaly from label
---
drivers/gpio/gpio-ep93xx.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 64d6c2b4282e..3d8eb8769470 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -38,6 +38,7 @@
#define EP93XX_GPIO_F_IRQ_BASE 80
struct ep93xx_gpio_irq_chip {
+ struct irq_chip ic;
u8 irq_offset;
u8 int_unmasked;
u8 int_enabled;
@@ -331,6 +332,16 @@ static int ep93xx_gpio_f_to_irq(struct gpio_chip *gc, unsigned offset)
return EP93XX_GPIO_F_IRQ_BASE + offset;
}
+static void ep93xx_init_irq_chip(struct device *dev, struct irq_chip *ic, const char *label)
+{
+ ic->name = devm_kasprintf(dev, GFP_KERNEL, "gpio-irq-%s", label);
+ ic->irq_ack = ep93xx_gpio_irq_ack;
+ ic->irq_mask_ack = ep93xx_gpio_irq_mask_ack;
+ ic->irq_mask = ep93xx_gpio_irq_mask;
+ ic->irq_unmask = ep93xx_gpio_irq_unmask;
+ ic->irq_set_type = ep93xx_gpio_irq_type;
+}
+
static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
struct platform_device *pdev,
struct ep93xx_gpio *epg,
@@ -352,6 +363,8 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
girq = &gc->irq;
if (bank->has_irq || bank->has_hierarchical_irq) {
+ struct irq_chip *ic;
+
gc->set_config = ep93xx_gpio_set_config;
egc->eic = devm_kcalloc(dev, 1,
sizeof(*egc->eic),
@@ -359,7 +372,9 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
if (!egc->eic)
return -ENOMEM;
egc->eic->irq_offset = bank->irq;
- girq->chip = &ep93xx_gpio_irq_chip;
+ ic = &egc->eic->ic;
+ ep93xx_init_irq_chip(dev, ic, bank->label);
+ girq->chip = ic;
}
if (bank->has_irq) {
--
2.26.2
next prev parent reply other threads:[~2021-02-08 9:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 8:59 [PATCH v5 0/7] gpio: ep93xx: fixes series patch Nikita Shubin
2021-02-08 8:59 ` [PATCH v5 1/7] gpio: ep93xx: fix BUG_ON port F usage Nikita Shubin
2021-02-08 15:43 ` Alexander Sverdlin
2021-02-08 8:59 ` Nikita Shubin [this message]
2021-02-08 13:20 ` [PATCH v5 2/7] gpio: ep93xx: Fix single irqchip with multi gpiochips Andy Shevchenko
2021-02-09 12:33 ` Nikita Shubin
2021-02-09 12:46 ` Andy Shevchenko
2021-02-09 12:54 ` Nikita Shubin
2021-02-09 13:51 ` Andy Shevchenko
2021-02-08 15:48 ` Alexander Sverdlin
2021-02-08 8:59 ` [PATCH v5 3/7] gpio: ep93xx: Fix wrong irq numbers in port F Nikita Shubin
2021-02-08 8:59 ` [PATCH v5 4/7] gpio: ep93xx: drop to_irq binding Nikita Shubin
2021-02-08 8:59 ` [PATCH v5 5/7] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Nikita Shubin
2021-02-08 8:59 ` [PATCH v5 6/7] gpio: ep93xx: refactor ep93xx_gpio_add_bank Nikita Shubin
2021-02-08 8:59 ` [PATCH v5 7/7] gpio: ep93xx: refactor base IRQ number Nikita Shubin
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=20210208085954.30050-3-nikita.shubin@maquefel.me \
--to=nikita.shubin@maquefel.me \
--cc=alexander.sverdlin@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).