| From b644c640923b625340c603cdb8d8f456406eb4de Mon Sep 17 00:00:00 2001 |
| From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> |
| Date: Fri, 1 Aug 2025 09:18:58 +0200 |
| Subject: Revert "gpio: pxa: Make irq_chip immutable" |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> |
| |
| commit b644c640923b625340c603cdb8d8f456406eb4de upstream. |
| |
| This reverts commit 20117cf426b6 ("gpio: pxa: Make irq_chip immutableas") |
| as it caused a regression on samsung coreprimevelte and we've not been |
| able to fix it so far. |
| |
| Cc: stable@vger.kernel.org # v6.16 |
| Fixes: 20117cf426b6 ("gpio: pxa: Make irq_chip immutableas") |
| Reported-by: Duje Mihanović <duje@dujemihanovic.xyz> |
| Closes: https://lore.kernel.org/all/3367665.aeNJFYEL58@radijator/ |
| Tested-by: Duje Mihanović <duje@dujemihanovic.xyz> |
| Link: https://lore.kernel.org/r/20250801071858.7554-1-brgl@bgdev.pl |
| Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpio/gpio-pxa.c | 8 +------- |
| 1 file changed, 1 insertion(+), 7 deletions(-) |
| |
| --- a/drivers/gpio/gpio-pxa.c |
| +++ b/drivers/gpio/gpio-pxa.c |
| @@ -497,8 +497,6 @@ static void pxa_mask_muxed_gpio(struct i |
| 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) |
| @@ -518,21 +516,17 @@ static void pxa_unmask_muxed_gpio(struct |
| 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 const struct irq_chip pxa_muxed_gpio_chip = { |
| +static 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) |
