Skip to content

Commit d30c0d3

Browse files
committed
Merge tag 'gpio-fixes-for-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fix from Bartosz Golaszewski: - fix a regression in irqchip setup in gpio-zynq * tag 'gpio-fixes-for-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: zynq: restore zynq_gpio_irq_reqres/zynq_gpio_irq_relres callbacks
2 parents a3d231e + 180b10b commit d30c0d3

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

drivers/gpio/gpio-zynq.c

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,26 @@ static int zynq_gpio_set_wake(struct irq_data *data, unsigned int on)
575575
return 0;
576576
}
577577

578+
static int zynq_gpio_irq_reqres(struct irq_data *d)
579+
{
580+
struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
581+
int ret;
582+
583+
ret = pm_runtime_resume_and_get(chip->parent);
584+
if (ret < 0)
585+
return ret;
586+
587+
return gpiochip_reqres_irq(chip, d->hwirq);
588+
}
589+
590+
static void zynq_gpio_irq_relres(struct irq_data *d)
591+
{
592+
struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
593+
594+
gpiochip_relres_irq(chip, d->hwirq);
595+
pm_runtime_put(chip->parent);
596+
}
597+
578598
/* irq chip descriptor */
579599
static const struct irq_chip zynq_gpio_level_irqchip = {
580600
.name = DRIVER_NAME,
@@ -584,9 +604,10 @@ static const struct irq_chip zynq_gpio_level_irqchip = {
584604
.irq_unmask = zynq_gpio_irq_unmask,
585605
.irq_set_type = zynq_gpio_set_irq_type,
586606
.irq_set_wake = zynq_gpio_set_wake,
607+
.irq_request_resources = zynq_gpio_irq_reqres,
608+
.irq_release_resources = zynq_gpio_irq_relres,
587609
.flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED |
588610
IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
589-
GPIOCHIP_IRQ_RESOURCE_HELPERS,
590611
};
591612

592613
static const struct irq_chip zynq_gpio_edge_irqchip = {
@@ -597,8 +618,9 @@ static const struct irq_chip zynq_gpio_edge_irqchip = {
597618
.irq_unmask = zynq_gpio_irq_unmask,
598619
.irq_set_type = zynq_gpio_set_irq_type,
599620
.irq_set_wake = zynq_gpio_set_wake,
621+
.irq_request_resources = zynq_gpio_irq_reqres,
622+
.irq_release_resources = zynq_gpio_irq_relres,
600623
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
601-
GPIOCHIP_IRQ_RESOURCE_HELPERS,
602624
};
603625

604626
static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio,

0 commit comments

Comments
 (0)