Commit d30c0d32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3d231e4 180b10bd

drivers/gpio/gpio-zynq.c

+24 −2
Original line number Diff line number Diff line
@@ -575,6 +575,26 @@ static int zynq_gpio_set_wake(struct irq_data *data, unsigned int on) 
	return 0;

}



static int zynq_gpio_irq_reqres(struct irq_data *d)

{

	struct gpio_chip *chip = irq_data_get_irq_chip_data(d);

	int ret;



	ret = pm_runtime_resume_and_get(chip->parent);

	if (ret < 0)

		return ret;



	return gpiochip_reqres_irq(chip, d->hwirq);

}



static void zynq_gpio_irq_relres(struct irq_data *d)

{

	struct gpio_chip *chip = irq_data_get_irq_chip_data(d);



	gpiochip_relres_irq(chip, d->hwirq);

	pm_runtime_put(chip->parent);

}



/* irq chip descriptor */

static const struct irq_chip zynq_gpio_level_irqchip = {

	.name		= DRIVER_NAME,
@@ -584,9 +604,10 @@ static const struct irq_chip zynq_gpio_level_irqchip = { 
	.irq_unmask	= zynq_gpio_irq_unmask,

	.irq_set_type	= zynq_gpio_set_irq_type,

	.irq_set_wake	= zynq_gpio_set_wake,

	.irq_request_resources = zynq_gpio_irq_reqres,

	.irq_release_resources = zynq_gpio_irq_relres,

	.flags		= IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED |

			  IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



static const struct irq_chip zynq_gpio_edge_irqchip = {
@@ -597,8 +618,9 @@ static const struct irq_chip zynq_gpio_edge_irqchip = { 
	.irq_unmask	= zynq_gpio_irq_unmask,

	.irq_set_type	= zynq_gpio_set_irq_type,

	.irq_set_wake	= zynq_gpio_set_wake,

	.irq_request_resources = zynq_gpio_irq_reqres,

	.irq_release_resources = zynq_gpio_irq_relres,

	.flags		= IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,

	GPIOCHIP_IRQ_RESOURCE_HELPERS,

};



static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio,