Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 308ac756 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull late GPIO fixes from Linus Walleij:
 "Some late coming ACPI fixes for GPIO.

  We're dealing with ACPI issues here. The first is related to wake IRQs
  on Bay Trail/Cherry Trail CPUs which are common in laptops. The second
  is about proper probe deferral when reading _CRS properties.

  For my untrained eye it seems there was some quarrel between the BIOS
  and the kernel about who is supposed to deal with wakeups from GPIO
  lines"

* tag 'gpio-v4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  ACPI / gpio: do not fall back to parsing _CRS when we get a deferral
  gpio: acpi: Call enable_irq_wake for _IAE GpioInts with Wake set
parents b824a957 693bdaa1

drivers/gpio/gpiolib-acpi.c

+9 −1
Original line number Diff line number Diff line
@@ -266,6 +266,9 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, 
		goto fail_free_event;

	}



	if (agpio->wake_capable == ACPI_WAKE_CAPABLE)

		enable_irq_wake(irq);



	list_add_tail(&event->node, &acpi_gpio->events);

	return AE_OK;
@@ -339,6 +342,9 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) 
	list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) {

		struct gpio_desc *desc;



		if (irqd_is_wakeup_set(irq_get_irq_data(event->irq)))

			disable_irq_wake(event->irq);



		free_irq(event->irq, event);

		desc = event->desc;

		if (WARN_ON(IS_ERR(desc)))
@@ -571,8 +577,10 @@ struct gpio_desc *acpi_find_gpio(struct device *dev, 
		}



		desc = acpi_get_gpiod_by_index(adev, propname, idx, &info);

		if (!IS_ERR(desc) || (PTR_ERR(desc) == -EPROBE_DEFER))

		if (!IS_ERR(desc))

			break;

		if (PTR_ERR(desc) == -EPROBE_DEFER)

			return ERR_CAST(desc);

	}



	/* Then from plain _CRS GPIOs */