Commit 325354cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 22e6abaa 1af7e441

drivers/acpi/resource.c

+10 −66
Original line number Diff line number Diff line
@@ -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 */

		.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 */

		/* Asus Vivobook Pro N6506M* */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "N6506MJ"),

			DMI_MATCH(DMI_BOARD_NAME, "N6506M"),

		},

	},

	{