Skip to content

Commit 9bc2fb9

Browse files
committed
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
3 parents 94f6f05 + cd4aece + f9b3ea0 commit 9bc2fb9

File tree

2 files changed

+31
-6
lines changed

2 files changed

+31
-6
lines changed

drivers/acpi/ec.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,6 +1913,17 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = {
19131913
DMI_MATCH(DMI_PRODUCT_NAME, "HP 15-cx0041ur"),
19141914
},
19151915
},
1916+
{
1917+
/*
1918+
* HP Pavilion Gaming Laptop 15-dk1xxx
1919+
* https://github.com/systemd/systemd/issues/28942
1920+
*/
1921+
.callback = ec_honor_dsdt_gpe,
1922+
.matches = {
1923+
DMI_MATCH(DMI_SYS_VENDOR, "HP"),
1924+
DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-dk1xxx"),
1925+
},
1926+
},
19161927
{
19171928
/*
19181929
* Samsung hardware

drivers/acpi/resource.c

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,13 @@ static const struct dmi_system_id asus_laptop[] = {
439439
DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
440440
},
441441
},
442+
{
443+
.ident = "Asus ExpertBook B1402CBA",
444+
.matches = {
445+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
446+
DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
447+
},
448+
},
442449
{
443450
.ident = "Asus ExpertBook B1502CBA",
444451
.matches = {
@@ -500,16 +507,23 @@ static const struct dmi_system_id maingear_laptop[] = {
500507

501508
static const struct dmi_system_id pcspecialist_laptop[] = {
502509
{
503-
.ident = "PCSpecialist Elimina Pro 16 M",
504-
/*
505-
* Some models have product-name "Elimina Pro 16 M",
506-
* others "GM6BGEQ". Match on board-name to match both.
507-
*/
510+
/* TongFang GM6BGEQ / PCSpecialist Elimina Pro 16 M, RTX 3050 */
508511
.matches = {
509-
DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"),
510512
DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"),
511513
},
512514
},
515+
{
516+
/* TongFang GM6BG5Q, RTX 4050 */
517+
.matches = {
518+
DMI_MATCH(DMI_BOARD_NAME, "GM6BG5Q"),
519+
},
520+
},
521+
{
522+
/* TongFang GM6BG0Q / PCSpecialist Elimina Pro 16 M, RTX 4060 */
523+
.matches = {
524+
DMI_MATCH(DMI_BOARD_NAME, "GM6BG0Q"),
525+
},
526+
},
513527
{ }
514528
};
515529

0 commit comments

Comments
 (0)