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 v4 7/7] gpio: ep93xx: refactor base IRQ number
Date: Fri, 5 Feb 2021 11:05:07 +0300 [thread overview]
Message-ID: <20210205080507.16007-8-nikita.shubin@maquefel.me> (raw)
In-Reply-To: <20210205080507.16007-1-nikita.shubin@maquefel.me>
- use predefined constants instead of plain numbers
- use provided bank IRQ number instead of defined constant
for port F
Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
---
drivers/gpio/gpio-ep93xx.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index 41b5b1de14f6..252f7d765ff2 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -31,6 +31,8 @@
/* Maximum value for irq capable line identifiers */
#define EP93XX_GPIO_LINE_MAX_IRQ 23
+#define EP93XX_GPIO_A_IRQ_BASE 64
+#define EP93XX_GPIO_B_IRQ_BASE 72
/*
* Static mapping of GPIO bank F IRQS:
* F0..F7 (16..24) to irq 80..87.
@@ -304,14 +306,17 @@ _irq_name) \
static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = {
/* Bank A has 8 IRQs */
- EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false, 64, "gpio-irq-a"),
+ EP93XX_GPIO_BANK("A", 0x00, 0x10, 0x90, 0, true, false,
+ EP93XX_GPIO_A_IRQ_BASE, "gpio-irq-a"),
/* Bank B has 8 IRQs */
- EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false, 72, "gpio-irq-b"),
+ EP93XX_GPIO_BANK("B", 0x04, 0x14, 0xac, 8, true, false,
+ EP93XX_GPIO_B_IRQ_BASE, "gpio-irq-b"),
EP93XX_GPIO_BANK("C", 0x08, 0x18, 0x00, 40, false, false, 0, 0),
EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 0x00, 24, false, false, 0, 0),
EP93XX_GPIO_BANK("E", 0x20, 0x24, 0x00, 32, false, false, 0, 0),
/* Bank F has 8 IRQs */
- EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, 0, "gpio-irq-b"),
+ EP93XX_GPIO_BANK("F", 0x30, 0x34, 0x4c, 16, false, true, 0,
+ EP93XX_GPIO_F_IRQ_BASE, "gpio-irq-b"),
EP93XX_GPIO_BANK("G", 0x38, 0x3c, 0x00, 48, false, false, 0, 0),
EP93XX_GPIO_BANK("H", 0x40, 0x44, 0x00, 56, false, false, 0, 0),
};
@@ -410,7 +415,7 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
/* Pick resources 1..8 for these IRQs */
for (i = 0; i < girq->num_parents; i++) {
girq->parents[i] = platform_get_irq(pdev, i + 1);
- gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i;
+ gpio_irq = bank->irq_base + i;
irq_set_chip_data(gpio_irq, &epg->gc[5]);
irq_set_chip_and_handler(gpio_irq,
&ep93xx_gpio_irq_chip,
@@ -419,7 +424,7 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
}
girq->default_type = IRQ_TYPE_NONE;
girq->handler = handle_level_irq;
- girq->first = EP93XX_GPIO_F_IRQ_BASE;
+ girq->first = bank->irq_base;
}
return devm_gpiochip_add_data(dev, gc, epg);
--
2.26.2
next prev parent reply other threads:[~2021-02-05 8:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 8:05 [PATCH v4 0/7] gpio: ep93xx: fixes series patch Nikita Shubin
2021-02-05 8:05 ` [PATCH v4 1/7] gpio: gpio-ep93xx: fix BUG_ON port F usage Nikita Shubin
2021-02-05 9:34 ` Alexander Sverdlin
2021-02-05 8:05 ` [PATCH v4 2/7] gpio: gpio-ep93xx: Fix single irqchip with multi gpiochips Nikita Shubin
2021-02-05 8:37 ` Alexander Sverdlin
2021-02-05 8:05 ` [PATCH v4 3/7] gpio: gpio-ep93xx: Fix wrong irq numbers in port F Nikita Shubin
2021-02-05 8:05 ` [PATCH v4 4/7] gpio: ep93xx: drop to_irq binding Nikita Shubin
2021-02-05 8:05 ` [PATCH v4 5/7] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Nikita Shubin
2021-02-05 8:05 ` [PATCH v4 6/7] gpio: ep93xx: refactor ep93xx_gpio_add_bank Nikita Shubin
2021-02-05 8:05 ` Nikita Shubin [this message]
2021-02-05 10:34 ` [PATCH v4 0/7] gpio: ep93xx: fixes series patch Bartosz Golaszewski
2021-02-05 10:48 ` Andy Shevchenko
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=20210205080507.16007-8-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).