Commit 9bc2fb9a authored Oct 13, 2023 by Rafael J. Wysocki

Merge branches 'acpi-ec' and 'acpi-resource'

Merge ACPI EC driver and ACPI resources handlig changes for 6.6-rc6:

 - Add EC GPE fixup quirk for HP Pavilion Gaming 15-dk1xxx (Hans de
   Goede).

 - Add ACPI IRQ override quirks for TongFang GM6BGEQ, GM6BG5Q and
   GM6BG0Q, and for ASUS ExpertBook B1402CBA (ans de Goede).

* acpi-ec:
  ACPI: EC: Add quirk for the HP Pavilion Gaming 15-dk1xxx

* acpi-resource:
  ACPI: resource: Add TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q to irq1_edge_low_force_override[]
  ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA

parents 94f6f055 cd4aece4 f9b3ea02

drivers/acpi/ec.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -1913,6 +1913,17 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
		DMI_MATCH(DMI_PRODUCT_NAME, "HP 15-cx0041ur"),
		},
		},
		{
		/*
		* HP Pavilion Gaming Laptop 15-dk1xxx
		* https://github.com/systemd/systemd/issues/28942
		*/
		.callback = ec_honor_dsdt_gpe,
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "HP"),
		DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-dk1xxx"),
		},
		},
		{
		/*
		* Samsung hardware

drivers/acpi/resource.c

+20 −6

Original line number	Diff line number	Diff line
		@@ -439,6 +439,13 @@ static const struct dmi_system_id asus_laptop[] = {
		DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
		},
		},
		{
		.ident = "Asus ExpertBook B1402CBA",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
		DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
		},
		},
		{
		.ident = "Asus ExpertBook B1502CBA",
		.matches = {
		@@ -500,16 +507,23 @@ static const struct dmi_system_id maingear_laptop[] = {

		static const struct dmi_system_id pcspecialist_laptop[] = {
		{
		.ident = "PCSpecialist Elimina Pro 16 M",
		/*
		* Some models have product-name "Elimina Pro 16 M",
		* others "GM6BGEQ". Match on board-name to match both.
		*/
		/* TongFang GM6BGEQ / PCSpecialist Elimina Pro 16 M, RTX 3050 */
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"),
		DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"),
		},
		},
		{
		/* TongFang GM6BG5Q, RTX 4050 */
		.matches = {
		DMI_MATCH(DMI_BOARD_NAME, "GM6BG5Q"),
		},
		},
		{
		/* TongFang GM6BG0Q / PCSpecialist Elimina Pro 16 M, RTX 4060 */
		.matches = {
		DMI_MATCH(DMI_BOARD_NAME, "GM6BG0Q"),
		},
		},
		{ }
		};