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

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

Pull ACPI fix from Rafael Wysocki:
 "Add an ACPI IRQ override quirk for LG UltraPC 17U70P so as to make the
  internal keyboard work on that machine (Rubén Gómez)"

* tag 'acpi-6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P
parents cbd6ac38 71a48562

drivers/acpi/resource.c

+12 −0
Original line number Diff line number Diff line
@@ -516,6 +516,17 @@ static const struct dmi_system_id maingear_laptop[] = { 
	{ }

};



static const struct dmi_system_id lg_laptop[] = {

	{

		.ident = "LG Electronics 17U70P",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"),

			DMI_MATCH(DMI_BOARD_NAME, "17U70P"),

		},

	},

	{ }

};



struct irq_override_cmp {

	const struct dmi_system_id *system;

	unsigned char irq;
@@ -532,6 +543,7 @@ static const struct irq_override_cmp override_table[] = { 
	{ lenovo_laptop, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },

	{ tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },

	{ maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },

	{ lg_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },

};



static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,