diff options
| -rw-r--r-- | queue-5.4/gpio-pxa-make-irq_chip-immutable.patch | 63 | ||||
| -rw-r--r-- | queue-5.4/series | 1 |
2 files changed, 0 insertions, 64 deletions
diff --git a/queue-5.4/gpio-pxa-make-irq_chip-immutable.patch b/queue-5.4/gpio-pxa-make-irq_chip-immutable.patch deleted file mode 100644 index 7aee16c8a43..00000000000 --- a/queue-5.4/gpio-pxa-make-irq_chip-immutable.patch +++ /dev/null @@ -1,63 +0,0 @@ -From a0b11abb5459e6c6b29904f91daf63f6754a4b45 Mon Sep 17 00:00:00 2001 -From: Sasha Levin <sashal@kernel.org> -Date: Fri, 9 May 2025 12:45:40 +0800 -Subject: gpio: pxa: Make irq_chip immutable - -From: Peng Fan <peng.fan@nxp.com> - -[ Upstream commit 20117cf426b677e7aced4e7a1b2b37f6080a46dc ] - -Kernel warns about mutable irq_chips: -"not an immutable chip, please consider fixing!" - -Constify pxa_muxed_gpio_chip, flag the irq_chip as IRQCHIP_IMMUTABLE, -add the new helper functions, and call the appropriate gpiolib functions. - -Signed-off-by: Peng Fan <peng.fan@nxp.com> -Reviewed-by: Linus Walleij <linus.walleij@linaro.org> -Link: https://lore.kernel.org/r/20250509-gpio-v1-9-639377c98288@nxp.com -Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> -Signed-off-by: Sasha Levin <sashal@kernel.org> ---- - drivers/gpio/gpio-pxa.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c -index 5c770b7891f71..177529aecc697 100644 ---- a/drivers/gpio/gpio-pxa.c -+++ b/drivers/gpio/gpio-pxa.c -@@ -508,6 +508,8 @@ static void pxa_mask_muxed_gpio(struct irq_data *d) - gfer = readl_relaxed(base + GFER_OFFSET) & ~GPIO_bit(gpio); - writel_relaxed(grer, base + GRER_OFFSET); - writel_relaxed(gfer, base + GFER_OFFSET); -+ -+ gpiochip_disable_irq(&pchip->chip, gpio); - } - - static int pxa_gpio_set_wake(struct irq_data *d, unsigned int on) -@@ -527,17 +529,21 @@ static void pxa_unmask_muxed_gpio(struct irq_data *d) - unsigned int gpio = irqd_to_hwirq(d); - struct pxa_gpio_bank *c = gpio_to_pxabank(&pchip->chip, gpio); - -+ gpiochip_enable_irq(&pchip->chip, gpio); -+ - c->irq_mask |= GPIO_bit(gpio); - update_edge_detect(c); - } - --static struct irq_chip pxa_muxed_gpio_chip = { -+static const struct irq_chip pxa_muxed_gpio_chip = { - .name = "GPIO", - .irq_ack = pxa_ack_muxed_gpio, - .irq_mask = pxa_mask_muxed_gpio, - .irq_unmask = pxa_unmask_muxed_gpio, - .irq_set_type = pxa_gpio_irq_type, - .irq_set_wake = pxa_gpio_set_wake, -+ .flags = IRQCHIP_IMMUTABLE, -+ GPIOCHIP_IRQ_RESOURCE_HELPERS, - }; - - static int pxa_gpio_nums(struct platform_device *pdev) --- -2.39.5 - diff --git a/queue-5.4/series b/queue-5.4/series index 786fdb63abb..67963795222 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -155,7 +155,6 @@ drm-amdkfd-set-sdma_rlcx_ib_cntl-switch_inside_ib.patch media-tc358743-ignore-video-while-hpd-is-low.patch media-platform-exynos4-is-add-hardware-sync-wait-to-.patch nios2-force-update_mmu_cache-on-spurious-tlb-permiss.patch -gpio-pxa-make-irq_chip-immutable.patch cpufreq-force-sync-policy-boost-with-global-boost-on.patch net-macb-check-return-value-of-dma_set_mask_and_cohe.patch i2c-designware-invoke-runtime-suspend-on-quick-slave.patch |