Skip to content

Commit b644c64

Browse files
author
Bartosz Golaszewski
committed
Revert "gpio: pxa: Make irq_chip immutable"
This reverts commit 20117cf ("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: [email protected] # v6.16 Fixes: 20117cf ("gpio: pxa: Make irq_chip immutableas") Reported-by: Duje Mihanović <[email protected]> Closes: https://lore.kernel.org/all/3367665.aeNJFYEL58@radijator/ Tested-by: Duje Mihanović <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bartosz Golaszewski <[email protected]>
1 parent 186f3ed commit b644c64

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/gpio/gpio-pxa.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ static void pxa_mask_muxed_gpio(struct irq_data *d)
499499
gfer = readl_relaxed(base + GFER_OFFSET) & ~GPIO_bit(gpio);
500500
writel_relaxed(grer, base + GRER_OFFSET);
501501
writel_relaxed(gfer, base + GFER_OFFSET);
502-
503-
gpiochip_disable_irq(&pchip->chip, gpio);
504502
}
505503

506504
static int pxa_gpio_set_wake(struct irq_data *d, unsigned int on)
@@ -520,21 +518,17 @@ static void pxa_unmask_muxed_gpio(struct irq_data *d)
520518
unsigned int gpio = irqd_to_hwirq(d);
521519
struct pxa_gpio_bank *c = gpio_to_pxabank(&pchip->chip, gpio);
522520

523-
gpiochip_enable_irq(&pchip->chip, gpio);
524-
525521
c->irq_mask |= GPIO_bit(gpio);
526522
update_edge_detect(c);
527523
}
528524

529-
static const struct irq_chip pxa_muxed_gpio_chip = {
525+
static struct irq_chip pxa_muxed_gpio_chip = {
530526
.name = "GPIO",
531527
.irq_ack = pxa_ack_muxed_gpio,
532528
.irq_mask = pxa_mask_muxed_gpio,
533529
.irq_unmask = pxa_unmask_muxed_gpio,
534530
.irq_set_type = pxa_gpio_irq_type,
535531
.irq_set_wake = pxa_gpio_set_wake,
536-
.flags = IRQCHIP_IMMUTABLE,
537-
GPIOCHIP_IRQ_RESOURCE_HELPERS,
538532
};
539533

540534
static int pxa_gpio_nums(struct platform_device *pdev)

0 commit comments

Comments
 (0)