Merge tag 'acpi-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

Pull ACPI fixes from Rafael Wysocki:
 "Add an ACPI EC GPE detection quirk for HP Pavilion Gaming 15-dk1xxx
  and ACPI IRQ override quirks for TongFang GM6BGEQ, GM6BG5Q and
  GM6BG0Q, and for ASUS ExpertBook B1402CBA (Hans de Goede).

* tag 'acpi-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: resource: Add TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q to irq1_edge_low_force_override[]
  ACPI: EC: Add quirk for the HP Pavilion Gaming 15-dk1xxx
  ACPI: resource: Skip IRQ override on ASUS ExpertBook B1402CBA

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 660834a..c95d0ed 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1915,6 +1915,17 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
        },
        {
                /*
+                * 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
                 * https://bugzilla.kernel.org/show_bug.cgi?id=44161
                 */

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 32cfa3f..297a885 100644 (file)
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -440,6 +440,13 @@ static const struct dmi_system_id asus_laptop[] = {
                },
        },
        {
+               .ident = "Asus ExpertBook B1402CBA",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+                       DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
+               },
+       },
+       {
                .ident = "Asus ExpertBook B1502CBA",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
@@ -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"),
+               },
+       },
        { }
 };