kevin/linux
1
Fork 0
Code

ACPI fixes for 6.12-rc3

Browse Source 
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).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmcJQC0SHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxHEIP/ArrwoQJz+pT3ckIN+yjW0EnnEjiaf2g
 mzeZNJX0mW/k2YL18KxYrBAiVL/Ja7Rkwnl+EnG4n2zAA0Ok7yvfoi4wjIvfceOw
 r8qhelNNvmlOIlLPjvvO2491M/KyKs+1AkFLKhIiNVCrZrfz2kX2YyYl1KA9YmzA
 NgABCnM9Au5ixZcJZxjPpxM7ys4I2pSkqMBX3SXMIP0UipivTi2Jco/l0397KHRk
 BK+Gwf6LCQcnbZ60bxAQ5Dz9bMBbOsf2rnKEUAFAerLoe4s3QKkMz0kNgeiPax2i
 ggn8S07s4juK832vXYsAijW8ftvhLHpYYctyj6bz0fGHga+h4oyFSPbzRBfSQzSV
 I2O6UonGBHIty9CVSZZU9AxzpKM4fsKsoHVgBPXIBWZZ9G9SLPJwAduYmMy2OUrG
 DUEbvfxDrpmaePzfkKehkEzyzo8MVd1llEhlE+9SWsvPjMPbkDP4UMPL+CC0f30R
 d0unBU1vWWJstoTl6dr68bsbfcWe2uoU/2x3uPk+p6bnnt9icmsySKUlxQIwfDHl
 nuYjlxcMsL5nUQHT8oiqRPjO+m5VTJo3FvvrMvhf7g29YnOovmUK17579AllVKwR
 7g9/I4QfL3fY23nGTFgCYOMNaGeWjx670Q42Uivq/UdgyF9mVbtyVRuUBTRtS0TN
 VkYpXp+gyICk
 =6EeJ
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-10-11 11:32:10 -07:00
commit 325354cf00
1 changed files with 10 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
drivers/acpi/resource.c
View File

@ -448,73 +448,31 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
},
},
{
/* Asus ExpertBook B1402CBA */
/* Asus ExpertBook B1402C* */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
DMI_MATCH(DMI_BOARD_NAME, "B1402C"),
},
},
{
/* Asus ExpertBook B1402CVA */
/* Asus ExpertBook B1502C* */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),
DMI_MATCH(DMI_BOARD_NAME, "B1502C"),
},
},
{
/* Asus ExpertBook B1502CBA */
/* Asus ExpertBook B2402 (B2402CBA / B2402FBA / B2402CVA / B2402FVA) */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),
DMI_MATCH(DMI_BOARD_NAME, "B2402"),
},
},
{
/* Asus ExpertBook B1502CGA */
/* Asus ExpertBook B2502 (B2502CBA / B2502FBA / B2502CVA / B2502FVA) */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"),
},
},
{
/* Asus ExpertBook B1502CVA */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B1502CVA"),
},
},
{
/* Asus ExpertBook B2402CBA */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
},
},
{
/* Asus ExpertBook B2402FBA */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B2402FBA"),
},
},
{
/* Asus ExpertBook B2502 */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),
},
},
{
/* Asus ExpertBook B2502FBA */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B2502FBA"),
},
},
{
/* Asus ExpertBook B2502CVA */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "B2502CVA"),
DMI_MATCH(DMI_BOARD_NAME, "B2502"),
},
},
{
@ -532,24 +490,10 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = {
},
},
{
/* Asus Vivobook Pro N6506MV */
/* Asus Vivobook Pro N6506M* */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "N6506MV"),
},
},
{
/* Asus Vivobook Pro N6506MU */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "N6506MU"),
},
},
{
/* Asus Vivobook Pro N6506MJ */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
DMI_MATCH(DMI_BOARD_NAME, "N6506MJ"),
DMI_MATCH(DMI_BOARD_NAME, "N6506M"),
},
},
{