From: Steven Lee <steven_lee@aspeedtech.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Rob Herring <robh+dt@kernel.org>, Joel Stanley <joel@jms.id.au>,
Andrew Jeffery <andrew@aj.id.au>,
"open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
"moderated list:ARM/ASPEED MACHINE SUPPORT"
<linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/ASPEED MACHINE SUPPORT"
<linux-aspeed@lists.ozlabs.org>,
open list <linux-kernel@vger.kernel.org>
Cc: <steven_lee@aspeedtech.com>, <Hongweiz@ami.com>,
<ryan_chen@aspeedtech.com>, <billy_tsai@aspeedtech.com>
Subject: [PATCH v6 7/9] gpio: gpio-aspeed-sgpio: Move irq_chip to aspeed-sgpio struct
Date: Mon, 12 Jul 2021 18:03:14 +0800 [thread overview]
Message-ID: <20210712100317.23298-8-steven_lee@aspeedtech.com> (raw)
In-Reply-To: <20210712100317.23298-1-steven_lee@aspeedtech.com>
The current design initializes irq->chip from a global irqchip struct,
which causes multiple sgpio devices use the same irq_chip.
The patch moves irq_chip to aspeed_sgpio struct for initializing
irq_chip from their private gpio struct.
Signed-off-by: Steven Lee <steven_lee@aspeedtech.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/gpio/gpio-aspeed-sgpio.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/gpio/gpio-aspeed-sgpio.c b/drivers/gpio/gpio-aspeed-sgpio.c
index 9b809c28f842..6b3695197c97 100644
--- a/drivers/gpio/gpio-aspeed-sgpio.c
+++ b/drivers/gpio/gpio-aspeed-sgpio.c
@@ -29,6 +29,7 @@ struct aspeed_sgpio_pdata {
struct aspeed_sgpio {
struct gpio_chip chip;
+ struct irq_chip intc;
struct clk *pclk;
spinlock_t lock;
void __iomem *base;
@@ -403,14 +404,6 @@ static void aspeed_sgpio_irq_handler(struct irq_desc *desc)
chained_irq_exit(ic, desc);
}
-static struct irq_chip aspeed_sgpio_irqchip = {
- .name = "aspeed-sgpio",
- .irq_ack = aspeed_sgpio_irq_ack,
- .irq_mask = aspeed_sgpio_irq_mask,
- .irq_unmask = aspeed_sgpio_irq_unmask,
- .irq_set_type = aspeed_sgpio_set_type,
-};
-
static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,
struct platform_device *pdev)
{
@@ -433,8 +426,14 @@ static int aspeed_sgpio_setup_irqs(struct aspeed_sgpio *gpio,
iowrite32(0xffffffff, bank_reg(gpio, bank, reg_irq_status));
}
+ gpio->intc.name = dev_name(&pdev->dev);
+ gpio->intc.irq_ack = aspeed_sgpio_irq_ack;
+ gpio->intc.irq_mask = aspeed_sgpio_irq_mask;
+ gpio->intc.irq_unmask = aspeed_sgpio_irq_unmask;
+ gpio->intc.irq_set_type = aspeed_sgpio_set_type;
+
irq = &gpio->chip.irq;
- irq->chip = &aspeed_sgpio_irqchip;
+ irq->chip = &gpio->intc;
irq->init_valid_mask = aspeed_sgpio_irq_init_valid_mask;
irq->handler = handle_bad_irq;
irq->default_type = IRQ_TYPE_NONE;
--
2.17.1
next prev parent reply other threads:[~2021-07-12 10:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 10:03 [PATCH v6 0/9] ASPEED sgpio driver enhancement Steven Lee
2021-07-12 10:03 ` [PATCH v6 1/9] dt-bindings: aspeed-sgpio: Convert txt bindings to yaml Steven Lee
2021-07-23 9:55 ` Linus Walleij
2021-07-12 10:03 ` [PATCH v6 2/9] dt-bindings: aspeed-sgpio: Add ast2600 sgpio Steven Lee
2021-07-13 22:44 ` Rob Herring
2021-07-23 9:55 ` Linus Walleij
2021-07-12 10:03 ` [PATCH v6 3/9] ARM: dts: aspeed-g6: Add SGPIO node Steven Lee
2021-07-12 10:03 ` [PATCH v6 4/9] ARM: dts: aspeed-g5: Remove ngpios from sgpio node Steven Lee
2021-07-12 10:03 ` [PATCH v6 5/9] gpio: gpio-aspeed-sgpio: Add AST2600 sgpio support Steven Lee
2021-07-23 9:57 ` Linus Walleij
2021-07-12 10:03 ` [PATCH v6 6/9] gpio: gpio-aspeed-sgpio: Add set_config function Steven Lee
2021-07-23 9:58 ` Linus Walleij
2021-07-12 10:03 ` Steven Lee [this message]
2021-07-23 9:59 ` [PATCH v6 7/9] gpio: gpio-aspeed-sgpio: Move irq_chip to aspeed-sgpio struct Linus Walleij
2021-07-12 10:03 ` [PATCH v6 8/9] gpio: gpio-aspeed-sgpio: Use generic device property APIs Steven Lee
2021-07-23 9:59 ` Linus Walleij
2021-07-12 10:03 ` [PATCH v6 9/9] gpio: gpio-aspeed-sgpio: Return error if ngpios is not multiple of 8 Steven Lee
2021-07-23 10:00 ` Linus Walleij
2021-07-21 13:27 ` [PATCH v6 0/9] ASPEED sgpio driver enhancement Bartosz Golaszewski
2021-07-23 3:16 ` Steven Lee
2021-07-23 7:30 ` Bartosz Golaszewski
2021-08-03 4:48 ` Andrew Jeffery
2021-08-03 5:57 ` Joel Stanley
2021-08-05 19:17 ` Bartosz Golaszewski
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=20210712100317.23298-8-steven_lee@aspeedtech.com \
--to=steven_lee@aspeedtech.com \
--cc=Hongweiz@ami.com \
--cc=andrew@aj.id.au \
--cc=bgolaszewski@baylibre.com \
--cc=billy_tsai@aspeedtech.com \
--cc=devicetree@vger.kernel.org \
--cc=joel@jms.id.au \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=ryan_chen@aspeedtech.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;
as well as URLs for NNTP newsgroup(s).