Commit 0c2e31d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - revert a patch intruducing breakage in interrupt handling in
   gpio-mpc8xxx

 - correctly handle missing IRQs in gpio-tqmx86 by really making them
   optional

* tag 'gpio-updates-for-v5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: tqmx86: really make IRQ optional
  Revert "gpio: mpc8xxx: change the gpio interrupt flags."
parents d5ad8ec3 9b87f435

drivers/gpio/gpio-mpc8xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) 


	ret = devm_request_irq(&pdev->dev, mpc8xxx_gc->irqn,

			       mpc8xxx_gpio_irq_cascade,

			       IRQF_SHARED, "gpio-cascade",

			       IRQF_NO_THREAD | IRQF_SHARED, "gpio-cascade",

			       mpc8xxx_gc);

	if (ret) {

		dev_err(&pdev->dev,

drivers/gpio/gpio-tqmx86.c

+3 −3
Original line number Diff line number Diff line
@@ -238,8 +238,8 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret, irq;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

	irq = platform_get_irq_optional(pdev, 0);

	if (irq < 0 && irq != -ENXIO)

		return irq;



	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -278,7 +278,7 @@ static int tqmx86_gpio_probe(struct platform_device *pdev) 


	pm_runtime_enable(&pdev->dev);



	if (irq) {

	if (irq > 0) {

		struct irq_chip *irq_chip = &gpio->irq_chip;

		u8 irq_status;