From: Linus Walleij <linus.walleij@linaro.org> To: Mun Yew Tham <mun.yew.tham@intel.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, Alban Bedel <albeu@free.fr>, Orson Zhai <orsonzhai@gmail.com>, Baolin Wang <baolin.wang@linux.alibaba.com>, Chunyan Zhang <zhang.lyra@gmail.com>, Jay Fang <f.fangjian@huawei.com>, Daniel Palmer <daniel@thingy.jp>, Romain Perier <romain.perier@gmail.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Kevin Hilman <khilman@kernel.org>, William Breathitt Gray <william.gray@linaro.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-omap@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 11/17] gpio: msc313: Convert to immutable irq_chip Date: Thu, 16 Feb 2023 10:37:12 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v1-11-51a8f224a5d0@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v1-0-51a8f224a5d0@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. This conversion follows the pattern of the gpio-ixp4xx hierarchical GPIO interrupt driver. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-msc313.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-msc313.c b/drivers/gpio/gpio-msc313.c index 52d7b8d99170..57a6c43167f7 100644 --- a/drivers/gpio/gpio-msc313.c +++ b/drivers/gpio/gpio-msc313.c @@ -532,17 +532,35 @@ static int msc313_gpio_direction_output(struct gpio_chip *chip, unsigned int off return 0; } +static void msc313_gpio_irq_mask(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + irq_chip_mask_parent(d); + gpiochip_disable_irq(gc, d->hwirq); +} + +static void msc313_gpio_irq_unmask(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + gpiochip_enable_irq(gc, d->hwirq); + irq_chip_unmask_parent(d); +} + /* * The interrupt handling happens in the parent interrupt controller, * we don't do anything here. */ -static struct irq_chip msc313_gpio_irqchip = { +static const struct irq_chip msc313_gpio_irqchip = { .name = "GPIO", .irq_eoi = irq_chip_eoi_parent, - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, + .irq_mask = msc313_gpio_irq_mask, + .irq_unmask = msc313_gpio_irq_unmask, .irq_set_type = irq_chip_set_type_parent, .irq_set_affinity = irq_chip_set_affinity_parent, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; /* @@ -644,7 +662,7 @@ static int msc313_gpio_probe(struct platform_device *pdev) gpiochip->names = gpio->gpio_data->names; gpioirqchip = &gpiochip->irq; - gpioirqchip->chip = &msc313_gpio_irqchip; + gpio_irq_chip_set_chip(gpioirqchip, &msc313_gpio_irqchip); gpioirqchip->fwnode = of_node_to_fwnode(dev->of_node); gpioirqchip->parent_domain = parent_domain; gpioirqchip->child_to_parent_hwirq = msc313e_gpio_child_to_parent_hwirq; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org> To: Mun Yew Tham <mun.yew.tham@intel.com>, Bartosz Golaszewski <brgl@bgdev.pl>, Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>, Alban Bedel <albeu@free.fr>, Orson Zhai <orsonzhai@gmail.com>, Baolin Wang <baolin.wang@linux.alibaba.com>, Chunyan Zhang <zhang.lyra@gmail.com>, Jay Fang <f.fangjian@huawei.com>, Daniel Palmer <daniel@thingy.jp>, Romain Perier <romain.perier@gmail.com>, Grygorii Strashko <grygorii.strashko@ti.com>, Santosh Shilimkar <ssantosh@kernel.org>, Kevin Hilman <khilman@kernel.org>, William Breathitt Gray <william.gray@linaro.org> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-omap@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org>, Marc Zyngier <maz@kernel.org> Subject: [PATCH 11/17] gpio: msc313: Convert to immutable irq_chip Date: Thu, 16 Feb 2023 10:37:12 +0100 [thread overview] Message-ID: <20230215-immutable-chips-v1-11-51a8f224a5d0@linaro.org> (raw) In-Reply-To: <20230215-immutable-chips-v1-0-51a8f224a5d0@linaro.org> Convert the driver to immutable irq-chip with a bit of intuition. This conversion follows the pattern of the gpio-ixp4xx hierarchical GPIO interrupt driver. Cc: Marc Zyngier <maz@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpio/gpio-msc313.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-msc313.c b/drivers/gpio/gpio-msc313.c index 52d7b8d99170..57a6c43167f7 100644 --- a/drivers/gpio/gpio-msc313.c +++ b/drivers/gpio/gpio-msc313.c @@ -532,17 +532,35 @@ static int msc313_gpio_direction_output(struct gpio_chip *chip, unsigned int off return 0; } +static void msc313_gpio_irq_mask(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + irq_chip_mask_parent(d); + gpiochip_disable_irq(gc, d->hwirq); +} + +static void msc313_gpio_irq_unmask(struct irq_data *d) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(d); + + gpiochip_enable_irq(gc, d->hwirq); + irq_chip_unmask_parent(d); +} + /* * The interrupt handling happens in the parent interrupt controller, * we don't do anything here. */ -static struct irq_chip msc313_gpio_irqchip = { +static const struct irq_chip msc313_gpio_irqchip = { .name = "GPIO", .irq_eoi = irq_chip_eoi_parent, - .irq_mask = irq_chip_mask_parent, - .irq_unmask = irq_chip_unmask_parent, + .irq_mask = msc313_gpio_irq_mask, + .irq_unmask = msc313_gpio_irq_unmask, .irq_set_type = irq_chip_set_type_parent, .irq_set_affinity = irq_chip_set_affinity_parent, + .flags = IRQCHIP_IMMUTABLE, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; /* @@ -644,7 +662,7 @@ static int msc313_gpio_probe(struct platform_device *pdev) gpiochip->names = gpio->gpio_data->names; gpioirqchip = &gpiochip->irq; - gpioirqchip->chip = &msc313_gpio_irqchip; + gpio_irq_chip_set_chip(gpioirqchip, &msc313_gpio_irqchip); gpioirqchip->fwnode = of_node_to_fwnode(dev->of_node); gpioirqchip->parent_domain = parent_domain; gpioirqchip->child_to_parent_hwirq = msc313e_gpio_child_to_parent_hwirq; -- 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-02-16 9:38 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-16 9:37 [PATCH 00/17] Mass convert GPIO IRQ chips to be immutable Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 01/17] gpio: altera: Convert to immutable irq_chip Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 02/17] gpio: adnp: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 03/17] gpio: aspeed: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-27 0:44 ` Joel Stanley 2023-02-27 0:44 ` Joel Stanley 2023-02-16 9:37 ` [PATCH 04/17] gpio: aspeed-sgpio: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 05/17] gpio: ath79: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 06/17] gpio: cadence: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 07/17] gpio: eic_sprd: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 08/17] gpio: hisi: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 09/17] gpio: hlwd: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 10/17] gpio: idt3243x: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 13:28 ` Thomas Bogendoerfer 2023-02-17 13:28 ` Thomas Bogendoerfer 2023-02-16 9:37 ` Linus Walleij [this message] 2023-02-16 9:37 ` [PATCH 11/17] gpio: msc313: " Linus Walleij 2023-02-16 9:37 ` [PATCH 12/17] gpio: mlxbf2: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 13/17] gpio: max732x: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-16 9:37 ` [PATCH 14/17] gpio: omap: Drop irq_base Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 5:58 ` Tony Lindgren 2023-02-17 5:58 ` Tony Lindgren 2023-02-16 9:37 ` [PATCH 15/17] gpio: omap: Convert to immutable irq_chip Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-17 7:49 ` Tony Lindgren 2023-02-17 7:49 ` Tony Lindgren 2023-02-17 16:31 ` Andreas Kemnade 2023-02-17 16:31 ` Andreas Kemnade 2023-03-06 7:28 ` Tony Lindgren 2023-03-06 7:28 ` Tony Lindgren 2023-03-06 7:31 ` Tony Lindgren 2023-03-06 7:31 ` Tony Lindgren 2023-02-16 9:37 ` [PATCH 16/17] gpio: pci-idio-16: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-08 11:16 ` William Breathitt Gray 2023-02-08 11:16 ` William Breathitt Gray 2023-02-16 9:37 ` [PATCH 17/17] gpio: pcie-idio-24: " Linus Walleij 2023-02-16 9:37 ` Linus Walleij 2023-02-08 11:17 ` William Breathitt Gray 2023-02-08 11:17 ` William Breathitt Gray 2023-02-16 10:47 ` [PATCH 00/17] Mass convert GPIO IRQ chips to be immutable Marc Zyngier 2023-02-16 10:47 ` Marc Zyngier 2023-02-17 6:02 ` Tony Lindgren 2023-02-17 6:02 ` Tony Lindgren
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=20230215-immutable-chips-v1-11-51a8f224a5d0@linaro.org \ --to=linus.walleij@linaro.org \ --cc=albeu@free.fr \ --cc=andrew@aj.id.au \ --cc=baolin.wang@linux.alibaba.com \ --cc=brgl@bgdev.pl \ --cc=daniel@thingy.jp \ --cc=f.fangjian@huawei.com \ --cc=grygorii.strashko@ti.com \ --cc=joel@jms.id.au \ --cc=khilman@kernel.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=linux-omap@vger.kernel.org \ --cc=maz@kernel.org \ --cc=mun.yew.tham@intel.com \ --cc=orsonzhai@gmail.com \ --cc=romain.perier@gmail.com \ --cc=ssantosh@kernel.org \ --cc=william.gray@linaro.org \ --cc=zhang.lyra@gmail.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: 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.