From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org, "Bartosz Golaszewski" <brgl@bgdev.pl>, "Manivannan Sadhasivam" <mani@kernel.org>, "Thorsten Scherer" <t.scherer@eckelmann.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Robert Richter" <rric@kernel.org>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, "Michal Simek" <michal.simek@xilinx.com> Cc: linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 7/9] gpio: xgs-iproc: Convert to immutable irq_chip Date: Mon, 20 Mar 2023 10:55:14 +0100 [thread overview] Message-ID: <20230316-immutable-chips-2-v1-7-053d6ede831b@linaro.org> (raw) In-Reply-To: <20230316-immutable-chips-2-v1-0-053d6ede831b@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-xgs-iproc.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-xgs-iproc.c b/drivers/gpio/gpio-xgs-iproc.c index fd88500399c6..2d23b27d55af 100644 --- a/drivers/gpio/gpio-xgs-iproc.c +++ b/drivers/gpio/gpio-xgs-iproc.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #define IPROC_CCA_INT_F_GPIOINT BIT(0) @@ -27,7 +28,6 @@ #define IPROC_GPIO_CCA_INT_EDGE 0x24 struct iproc_gpio_chip { - struct irq_chip irqchip; struct gpio_chip gc; spinlock_t lock; struct device *dev; @@ -69,6 +69,7 @@ static void iproc_gpio_irq_unmask(struct irq_data *d) u32 irq = d->irq; u32 int_mask, irq_type, event_mask; + gpiochip_enable_irq(gc, pin); spin_lock_irqsave(&chip->lock, flags); irq_type = irq_get_trigger_type(irq); event_mask = readl_relaxed(chip->base + IPROC_GPIO_CCA_INT_EVENT_MASK); @@ -110,6 +111,7 @@ static void iproc_gpio_irq_mask(struct irq_data *d) chip->base + IPROC_GPIO_CCA_INT_LEVEL_MASK); } spin_unlock_irqrestore(&chip->lock, flags); + gpiochip_disable_irq(gc, pin); } static int iproc_gpio_irq_set_type(struct irq_data *d, u32 type) @@ -191,6 +193,24 @@ static irqreturn_t iproc_gpio_irq_handler(int irq, void *data) return int_bits ? IRQ_HANDLED : IRQ_NONE; } +static void iproc_gpio_irq_print_chip(struct irq_data *d, struct seq_file *p) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct iproc_gpio_chip *chip = to_iproc_gpio(gc); + + seq_printf(p, dev_name(chip->dev)); +} + +static const struct irq_chip iproc_gpio_irq_chip = { + .irq_ack = iproc_gpio_irq_ack, + .irq_mask = iproc_gpio_irq_mask, + .irq_unmask = iproc_gpio_irq_unmask, + .irq_set_type = iproc_gpio_irq_set_type, + .irq_print_chip = iproc_gpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int iproc_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -230,16 +250,8 @@ static int iproc_gpio_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq > 0) { struct gpio_irq_chip *girq; - struct irq_chip *irqc; u32 val; - irqc = &chip->irqchip; - irqc->name = dev_name(dev); - irqc->irq_ack = iproc_gpio_irq_ack; - irqc->irq_mask = iproc_gpio_irq_mask; - irqc->irq_unmask = iproc_gpio_irq_unmask; - irqc->irq_set_type = iproc_gpio_irq_set_type; - chip->intr = devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(chip->intr)) return PTR_ERR(chip->intr); @@ -261,7 +273,7 @@ static int iproc_gpio_probe(struct platform_device *pdev) } girq = &chip->gc.irq; - girq->chip = irqc; + gpio_irq_chip_set_chip(girq, &iproc_gpio_irq_chip); /* This will let us handle the parent IRQ in the driver */ girq->parent_handler = NULL; girq->num_parents = 0; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org> To: linux-gpio@vger.kernel.org, "Bartosz Golaszewski" <brgl@bgdev.pl>, "Manivannan Sadhasivam" <mani@kernel.org>, "Thorsten Scherer" <t.scherer@eckelmann.de>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Maxime Coquelin" <mcoquelin.stm32@gmail.com>, "Alexandre Torgue" <alexandre.torgue@foss.st.com>, "Robert Richter" <rric@kernel.org>, "Nobuhiro Iwamatsu" <nobuhiro1.iwamatsu@toshiba.co.jp>, "Ray Jui" <rjui@broadcom.com>, "Scott Branden" <sbranden@broadcom.com>, "Broadcom internal kernel review list" <bcm-kernel-feedback-list@broadcom.com>, "Shubhrajyoti Datta" <shubhrajyoti.datta@xilinx.com>, "Srinivas Neeli" <srinivas.neeli@xilinx.com>, "Michal Simek" <michal.simek@xilinx.com> Cc: linux-arm-kernel@lists.infradead.org, linux-unisoc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 7/9] gpio: xgs-iproc: Convert to immutable irq_chip Date: Mon, 20 Mar 2023 10:55:14 +0100 [thread overview] Message-ID: <20230316-immutable-chips-2-v1-7-053d6ede831b@linaro.org> (raw) In-Reply-To: <20230316-immutable-chips-2-v1-0-053d6ede831b@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-xgs-iproc.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-xgs-iproc.c b/drivers/gpio/gpio-xgs-iproc.c index fd88500399c6..2d23b27d55af 100644 --- a/drivers/gpio/gpio-xgs-iproc.c +++ b/drivers/gpio/gpio-xgs-iproc.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #define IPROC_CCA_INT_F_GPIOINT BIT(0) @@ -27,7 +28,6 @@ #define IPROC_GPIO_CCA_INT_EDGE 0x24 struct iproc_gpio_chip { - struct irq_chip irqchip; struct gpio_chip gc; spinlock_t lock; struct device *dev; @@ -69,6 +69,7 @@ static void iproc_gpio_irq_unmask(struct irq_data *d) u32 irq = d->irq; u32 int_mask, irq_type, event_mask; + gpiochip_enable_irq(gc, pin); spin_lock_irqsave(&chip->lock, flags); irq_type = irq_get_trigger_type(irq); event_mask = readl_relaxed(chip->base + IPROC_GPIO_CCA_INT_EVENT_MASK); @@ -110,6 +111,7 @@ static void iproc_gpio_irq_mask(struct irq_data *d) chip->base + IPROC_GPIO_CCA_INT_LEVEL_MASK); } spin_unlock_irqrestore(&chip->lock, flags); + gpiochip_disable_irq(gc, pin); } static int iproc_gpio_irq_set_type(struct irq_data *d, u32 type) @@ -191,6 +193,24 @@ static irqreturn_t iproc_gpio_irq_handler(int irq, void *data) return int_bits ? IRQ_HANDLED : IRQ_NONE; } +static void iproc_gpio_irq_print_chip(struct irq_data *d, struct seq_file *p) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + struct iproc_gpio_chip *chip = to_iproc_gpio(gc); + + seq_printf(p, dev_name(chip->dev)); +} + +static const struct irq_chip iproc_gpio_irq_chip = { + .irq_ack = iproc_gpio_irq_ack, + .irq_mask = iproc_gpio_irq_mask, + .irq_unmask = iproc_gpio_irq_unmask, + .irq_set_type = iproc_gpio_irq_set_type, + .irq_print_chip = iproc_gpio_irq_print_chip, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int iproc_gpio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -230,16 +250,8 @@ static int iproc_gpio_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq > 0) { struct gpio_irq_chip *girq; - struct irq_chip *irqc; u32 val; - irqc = &chip->irqchip; - irqc->name = dev_name(dev); - irqc->irq_ack = iproc_gpio_irq_ack; - irqc->irq_mask = iproc_gpio_irq_mask; - irqc->irq_unmask = iproc_gpio_irq_unmask; - irqc->irq_set_type = iproc_gpio_irq_set_type; - chip->intr = devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(chip->intr)) return PTR_ERR(chip->intr); @@ -261,7 +273,7 @@ static int iproc_gpio_probe(struct platform_device *pdev) } girq = &chip->gc.irq; - girq->chip = irqc; + gpio_irq_chip_set_chip(girq, &iproc_gpio_irq_chip); /* This will let us handle the parent IRQ in the driver */ girq->parent_handler = NULL; girq->num_parents = 0; -- 2.34.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-20 9:55 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-20 9:55 [PATCH 0/9] Mass convert GPIO IRQ chips to be immutable part 2 Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 1/9] gpio: rda: Convert to immutable irq_chip Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 10:34 ` Manivannan Sadhasivam 2023-03-20 10:34 ` Manivannan Sadhasivam 2023-03-20 9:55 ` [PATCH 2/9] gpio: siox: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 3/9] gpio: stmpe: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 4/9] gpio: thunderx: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 5/9] gpio: tqmx86: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 6/9] gpio: visconti: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` Linus Walleij [this message] 2023-03-20 9:55 ` [PATCH 7/9] gpio: xgs-iproc: " Linus Walleij 2023-03-20 9:55 ` [PATCH 8/9] gpio: xilinx: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 9:55 ` [PATCH 9/9] gpio: xlp: " Linus Walleij 2023-03-20 9:55 ` Linus Walleij 2023-03-20 11:10 ` [PATCH 0/9] Mass convert GPIO IRQ chips to be immutable part 2 Marc Zyngier 2023-03-20 11:10 ` Marc Zyngier 2023-03-22 16:52 ` Bartosz Golaszewski 2023-03-22 16:52 ` 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=20230316-immutable-chips-2-v1-7-053d6ede831b@linaro.org \ --to=linus.walleij@linaro.org \ --cc=alexandre.torgue@foss.st.com \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=brgl@bgdev.pl \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=linux-unisoc@lists.infradead.org \ --cc=mani@kernel.org \ --cc=maz@kernel.org \ --cc=mcoquelin.stm32@gmail.com \ --cc=michal.simek@xilinx.com \ --cc=nobuhiro1.iwamatsu@toshiba.co.jp \ --cc=rjui@broadcom.com \ --cc=rric@kernel.org \ --cc=sbranden@broadcom.com \ --cc=shubhrajyoti.datta@xilinx.com \ --cc=srinivas.neeli@xilinx.com \ --cc=t.scherer@eckelmann.de \ --cc=u.kleine-koenig@pengutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.