From: Mark Brown <broonie@kernel.org>
Date: Tue, 24 Mar 2026 17:29:47 +0000 (+0000)
Subject: ASoC: Merge up fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a306bef598886a64712e19b58edeae66e0df408;p=thirdparty%2Fkernel%2Fstable.git

ASoC: Merge up fixes

Merge branch 'for-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-7.1

to get fixes into our development branch and resolve interactions with
the match tables.
---

5a306bef598886a64712e19b58edeae66e0df408
diff --cc sound/soc/amd/yc/acp6x-mach.c
index 2b37330d4b3ca,6f1c105ca77e3..ac920263af9ee
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@@ -724,13 -717,20 +724,34 @@@ static const struct dmi_system_id yc_ac
  			DMI_MATCH(DMI_BOARD_NAME, "PM1503CDA"),
  		}
  	},
+ 	{
+ 		.driver_data = &acp6x_card,
+ 		.matches = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
+ 			DMI_MATCH(DMI_BOARD_NAME, "BM1403CDA"),
+ 		}
+ 	},
++	{
++		.driver_data = &acp6x_card,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),
++			DMI_MATCH(DMI_BOARD_NAME, "BM1403CDA"),
++		}
++	},
 +	{
 +		.driver_data = &acp6x_card,
 +		.matches = {
 +			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "Thin A15 B7VF"),
 +		}
 +	},
+ 	{
+ 		.driver_data = &acp6x_card,
+ 		.matches = {
+ 			DMI_MATCH(DMI_BOARD_VENDOR, "Micro-Star International Co., Ltd."),
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "Thin A15 B7VE"),
+ 		}
+ 	},
  	{}
  };