From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Hoan Tran <hoan@os.amperecomputing.com>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Serge Semin <fancer.lancer@gmail.com>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru>,
Rob Herring <robh+dt@kernel.org>, <linux-gpio@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 04/10] gpio: dwapb: Add max GPIOs macro
Date: Thu, 30 Jul 2020 16:55:30 +0300 [thread overview]
Message-ID: <20200730135536.19747-5-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20200730135536.19747-1-Sergey.Semin@baikalelectronics.ru>
Add a new macro DWAPB_MAX_GPIOS which defines the maximum possible number
of GPIO lines corresponding to the maximum DW APB GPIO controller port
width. Use the new macro instead of number literal 32 where it's
applicable.
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
---
drivers/gpio/gpio-dwapb.c | 8 ++++----
include/linux/platform_data/gpio-dwapb.h | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 3081213247d8..f34001152850 100644
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -162,7 +162,7 @@ static struct dwapb_gpio_port *dwapb_offs_to_port(struct dwapb_gpio *gpio, unsig
for (i = 0; i < gpio->nr_ports; i++) {
port = &gpio->ports[i];
- if (port->idx == offs / 32)
+ if (port->idx == offs / DWAPB_MAX_GPIOS)
return port;
}
@@ -182,7 +182,7 @@ static void dwapb_toggle_trigger(struct dwapb_gpio *gpio, unsigned int offs)
pol = dwapb_read(gpio, GPIO_INT_POLARITY);
/* Just read the current value right out of the data register */
- val = gc->get(gc, offs % 32);
+ val = gc->get(gc, offs % DWAPB_MAX_GPIOS);
if (val)
pol &= ~BIT(offs);
else
@@ -197,7 +197,7 @@ static u32 dwapb_do_irq(struct dwapb_gpio *gpio)
irq_hw_number_t hwirq;
irq_status = dwapb_read(gpio, GPIO_INTSTATUS);
- for_each_set_bit(hwirq, &irq_status, 32) {
+ for_each_set_bit(hwirq, &irq_status, DWAPB_MAX_GPIOS) {
int gpio_irq = irq_find_mapping(gpio->domain, hwirq);
u32 irq_type = irq_get_trigger_type(gpio_irq);
@@ -599,7 +599,7 @@ static struct dwapb_platform_data *dwapb_gpio_get_pdata(struct device *dev)
dev_info(dev,
"failed to get number of gpios for port%d\n",
i);
- pp->ngpio = 32;
+ pp->ngpio = DWAPB_MAX_GPIOS;
}
pp->irq_shared = false;
diff --git a/include/linux/platform_data/gpio-dwapb.h b/include/linux/platform_data/gpio-dwapb.h
index ff1be737bad6..0aa5c6720259 100644
--- a/include/linux/platform_data/gpio-dwapb.h
+++ b/include/linux/platform_data/gpio-dwapb.h
@@ -6,12 +6,14 @@
#ifndef GPIO_DW_APB_H
#define GPIO_DW_APB_H
+#define DWAPB_MAX_GPIOS 32
+
struct dwapb_port_property {
struct fwnode_handle *fwnode;
unsigned int idx;
unsigned int ngpio;
unsigned int gpio_base;
- int irq[32];
+ int irq[DWAPB_MAX_GPIOS];
bool irq_shared;
};
--
2.27.0
next prev parent reply other threads:[~2020-07-30 13:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 13:55 [PATCH v2 00/10] gpio: dwapb: Refactor GPIO resources initialization Serge Semin
2020-07-30 13:55 ` [PATCH v2 01/10] dt-bindings: gpio: dwapb: Add ngpios property support Serge Semin
2020-07-30 13:55 ` [PATCH v2 02/10] gpio: dwapb: Add ngpios DT-property support Serge Semin
2020-07-30 13:55 ` [PATCH v2 03/10] gpio: dwapb: Move MFD-specific IRQ handler Serge Semin
2020-07-30 13:55 ` Serge Semin [this message]
2020-07-30 14:05 ` [PATCH v2 04/10] gpio: dwapb: Add max GPIOs macro Andy Shevchenko
2020-07-30 14:07 ` Serge Semin
2020-07-30 14:25 ` Serge Semin
2020-07-30 13:55 ` [PATCH v2 05/10] gpio: dwapb: Convert driver to using the GPIO-lib-based IRQ-chip Serge Semin
2020-07-30 14:26 ` Andy Shevchenko
2020-07-30 14:38 ` Serge Semin
2020-07-30 13:55 ` [PATCH v2 06/10] gpio: dwapb: Discard GPIO-to-IRQ mapping function Serge Semin
2020-07-30 14:26 ` Andy Shevchenko
2020-07-30 13:55 ` [PATCH v2 07/10] gpio: dwapb: Discard ACPI GPIO-chip IRQs request Serge Semin
2020-07-30 14:27 ` Andy Shevchenko
2020-07-30 13:55 ` [PATCH v2 08/10] gpio: dwapb: Get reset control by means of resource managed interface Serge Semin
2020-07-30 13:55 ` [PATCH v2 09/10] gpio: dwapb: Get clocks " Serge Semin
2020-07-30 13:55 ` [PATCH v2 10/10] gpio: dwapb: Use resource managed GPIO-chip add data method Serge Semin
2020-07-30 14:16 ` [PATCH v2 00/10] gpio: dwapb: Refactor GPIO resources initialization Serge Semin
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=20200730135536.19747-5-Sergey.Semin@baikalelectronics.ru \
--to=sergey.semin@baikalelectronics.ru \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=Pavel.Parkhomenko@baikalelectronics.ru \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=fancer.lancer@gmail.com \
--cc=hoan@os.amperecomputing.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@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).