Skip to content

Commit 325354c

Browse files
committed
Merge tag 'acpi-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki: "Reduce the number of ACPI IRQ override DMI quirks by combining quirks that cover similar systems while making them cover additional models at the same time (Hans de Goede)" * tag 'acpi-6.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: resource: Fold Asus Vivobook Pro N6506M* DMI quirks together ACPI: resource: Fold Asus ExpertBook B1402C* and B1502C* DMI quirks together ACPI: resource: Make Asus ExpertBook B2502 matches cover more models ACPI: resource: Make Asus ExpertBook B2402 matches cover more models
2 parents 22e6aba + 1af7e44 commit 325354c

File tree

1 file changed

+10
-66
lines changed

1 file changed

+10
-66
lines changed

drivers/acpi/resource.c

Lines changed: 10 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -448,73 +448,31 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
448448
},
449449
},
450450
{
451-
/* Asus ExpertBook B1402CBA */
451+
/* Asus ExpertBook B1402C* */
452452
.matches = {
453453
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
454-
DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
454+
DMI_MATCH(DMI_BOARD_NAME, "B1402C"),
455455
},
456456
},
457457
{
458-
/* Asus ExpertBook B1402CVA */
458+
/* Asus ExpertBook B1502C* */
459459
.matches = {
460460
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
461-
DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),
461+
DMI_MATCH(DMI_BOARD_NAME, "B1502C"),
462462
},
463463
},
464464
{
465-
/* Asus ExpertBook B1502CBA */
465+
/* Asus ExpertBook B2402 (B2402CBA / B2402FBA / B2402CVA / B2402FVA) */
466466
.matches = {
467467
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
468-
DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),
468+
DMI_MATCH(DMI_BOARD_NAME, "B2402"),
469469
},
470470
},
471471
{
472-
/* Asus ExpertBook B1502CGA */
472+
/* Asus ExpertBook B2502 (B2502CBA / B2502FBA / B2502CVA / B2502FVA) */
473473
.matches = {
474474
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
475-
DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"),
476-
},
477-
},
478-
{
479-
/* Asus ExpertBook B1502CVA */
480-
.matches = {
481-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
482-
DMI_MATCH(DMI_BOARD_NAME, "B1502CVA"),
483-
},
484-
},
485-
{
486-
/* Asus ExpertBook B2402CBA */
487-
.matches = {
488-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
489-
DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
490-
},
491-
},
492-
{
493-
/* Asus ExpertBook B2402FBA */
494-
.matches = {
495-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
496-
DMI_MATCH(DMI_BOARD_NAME, "B2402FBA"),
497-
},
498-
},
499-
{
500-
/* Asus ExpertBook B2502 */
501-
.matches = {
502-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
503-
DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),
504-
},
505-
},
506-
{
507-
/* Asus ExpertBook B2502FBA */
508-
.matches = {
509-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
510-
DMI_MATCH(DMI_BOARD_NAME, "B2502FBA"),
511-
},
512-
},
513-
{
514-
/* Asus ExpertBook B2502CVA */
515-
.matches = {
516-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
517-
DMI_MATCH(DMI_BOARD_NAME, "B2502CVA"),
475+
DMI_MATCH(DMI_BOARD_NAME, "B2502"),
518476
},
519477
},
520478
{
@@ -532,24 +490,10 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
532490
},
533491
},
534492
{
535-
/* Asus Vivobook Pro N6506MV */
536-
.matches = {
537-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
538-
DMI_MATCH(DMI_BOARD_NAME, "N6506MV"),
539-
},
540-
},
541-
{
542-
/* Asus Vivobook Pro N6506MU */
543-
.matches = {
544-
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
545-
DMI_MATCH(DMI_BOARD_NAME, "N6506MU"),
546-
},
547-
},
548-
{
549-
/* Asus Vivobook Pro N6506MJ */
493+
/* Asus Vivobook Pro N6506M* */
550494
.matches = {
551495
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
552-
DMI_MATCH(DMI_BOARD_NAME, "N6506MJ"),
496+
DMI_MATCH(DMI_BOARD_NAME, "N6506M"),
553497
},
554498
},
555499
{

0 commit comments

Comments
 (0)