Commit 9dc5d985 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "Drop a lid status quirk for Asus T200TA that is not necessary any more
  and clean up a resource management inconsistency in the PCI IRQ link
  configuration code.

  Both changes from Hans de Goede"

* tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: button: Drop no longer necessary Asus T200TA lid_init_state quirk
  ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
parents bc0c4d1e 0db0d142

drivers/acpi/button.c

+0 −12
Original line number Diff line number Diff line
@@ -87,18 +87,6 @@ static const struct dmi_system_id dmi_lid_quirks[] = { 
		},

		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,

	},

	{

		/*

		 * Asus T200TA, _LID keeps reporting closed after every second

		 * openening of the lid. Causing immediate re-suspend after

		 * opening every other open. Using LID_INIT_OPEN fixes this.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "T200TA"),

		},

		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_OPEN,

	},

	{

		/* GP-electronic T701, _LID method points to a floating GPIO */

		.matches = {

drivers/acpi/pci_link.c

+2 −2
Original line number Diff line number Diff line
@@ -322,10 +322,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) 
		resource->res.data.extended_irq.polarity =

		    link->irq.polarity;

		if (link->irq.triggering == ACPI_EDGE_SENSITIVE)

			resource->res.data.irq.shareable =

			resource->res.data.extended_irq.shareable =

			    ACPI_EXCLUSIVE;

		else

			resource->res.data.irq.shareable = ACPI_SHARED;

			resource->res.data.extended_irq.shareable = ACPI_SHARED;

		resource->res.data.extended_irq.interrupt_count = 1;

		resource->res.data.extended_irq.interrupts[0] = irq;

		/* ignore resource_source, it's optional */

CRA Git | Maintained and supported by SUSTech CRA and CCSE