linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 8/9] gpio: ep93xx: refactor base IRQ number
Date: Wed, 27 Jan 2021 13:46:16 +0300	[thread overview]
Message-ID: <20210127104617.1173-9-nikita.shubin@maquefel.me> (raw)
In-Reply-To: <20210127104617.1173-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 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
index b212c007240e..2aee13b5067d 100644
--- a/drivers/gpio/gpio-ep93xx.c
+++ b/drivers/gpio/gpio-ep93xx.c
@@ -28,6 +28,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.
@@ -311,14 +313,14 @@ struct ep93xx_gpio_bank {
 
 static struct ep93xx_gpio_bank ep93xx_gpio_banks[] = {
 	/* Bank A has 8 IRQs */
-	EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, 64),
+	EP93XX_GPIO_BANK("A", 0x00, 0x10, 0, true, false, EP93XX_GPIO_A_IRQ_BASE),
 	/* Bank B has 8 IRQs */
-	EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, 72),
+	EP93XX_GPIO_BANK("B", 0x04, 0x14, 8, true, false, EP93XX_GPIO_B_IRQ_BASE),
 	EP93XX_GPIO_BANK("C", 0x08, 0x18, 40, false, false, 0),
 	EP93XX_GPIO_BANK("D", 0x0c, 0x1c, 24, false, false, 0),
 	EP93XX_GPIO_BANK("E", 0x20, 0x24, 32, false, false, 0),
 	/* Bank F has 8 IRQs */
-	EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, 0),
+	EP93XX_GPIO_BANK("F", 0x30, 0x34, 16, false, true, EP93XX_GPIO_F_IRQ_BASE),
 	EP93XX_GPIO_BANK("G", 0x38, 0x3c, 48, false, false, 0),
 	EP93XX_GPIO_BANK("H", 0x40, 0x44, 56, false, false, 0),
 };
@@ -445,7 +447,7 @@ static int ep93xx_gpio_add_bank(struct gpio_chip *gc,
 
 	/* Only bank F has especially funky IRQ handling */
 	if (bank->has_hierarchical_irq) {
-		err = ep93xx_gpio_add_f_irq_chip(pdev, girq, EP93XX_GPIO_F_IRQ_BASE);
+		err = ep93xx_gpio_add_f_irq_chip(pdev, girq, bank->irq_base);
 		if (err)
 			return err;
 	}
-- 
2.29.2


  parent reply	other threads:[~2021-01-27 10:49 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-28 15:00 [PATCH] gpiolib: warning on gpiochip->to_irq defined Nikita Shubin
2021-01-04 14:15 ` Bartosz Golaszewski
2021-01-18  9:05 ` [PATCH v2] " Nikita Shubin
2021-01-19 10:51   ` Bartosz Golaszewski
2021-01-27 10:46 ` [PATCH v2 0/9] gpio: ep93xx: fixes series patch Nikita Shubin
2021-01-27 10:46   ` [PATCH v2 1/9] gpio: ep93xx: fix BUG_ON port F usage Nikita Shubin
2021-01-27 10:46   ` [PATCH v2 2/9] gpio: ep93xx: Fix single irqchip with multi gpiochips Nikita Shubin
2021-01-27 21:39     ` Alexander Sverdlin
2021-01-28 10:17     ` Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 3/9] gpio: ep93xx: Fix wrong irq numbers in port F Nikita Shubin
2021-01-27 21:50     ` Linus Walleij
2021-01-28 10:15     ` Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 4/9] gpio: ep93xx: drop to_irq binding Nikita Shubin
2021-01-27 12:21     ` Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 5/9] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Nikita Shubin
2021-01-27 13:20     ` Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 6/9] gpio: ep93xx: refactor ep93xx_gpio_add_bank Nikita Shubin
2021-01-27 13:24     ` Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 7/9] gpio: ep93xx: separate IRQ's setup Nikita Shubin
2021-01-27 20:48     ` Alexander Sverdlin
2021-01-27 10:46   ` Nikita Shubin [this message]
2021-01-27 11:36     ` [PATCH v2 8/9] gpio: ep93xx: refactor base IRQ number Alexander Sverdlin
2021-01-27 10:46   ` [PATCH v2 9/9] gpio: ep93xx: replace bools with idx for IRQ ports Nikita Shubin
2021-01-27 11:34     ` Alexander Sverdlin
2021-01-27 21:54   ` [PATCH v2 0/9] gpio: ep93xx: fixes series patch Linus Walleij
2021-01-28 10:19     ` Alexander Sverdlin
2021-01-28 11:57       ` Linus Walleij

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=20210127104617.1173-9-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).