summaryrefslogtreecommitdiff
path: root/sound/soc/amd
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2025-03-14 02:31:06 +0000
committerMark Brown <broonie@kernel.org>2025-03-14 02:31:06 +0000
commite0afd7d370c6f577c1dacb1512e18048eabf322e (patch)
treeebe7e98755569509f132d61d1deabac38544e5fc /sound/soc/amd
parentf0066c8d1d3298e9f9d136a365139bac733e84c5 (diff)
parentde74ec718e0788e1998eb7289ad07970e27cae27 (diff)
ASoC: Merge up fixes
Merge the for-6.14 to resolve conflicts with simple-card-utils.c due to parallel delveopment.
Diffstat (limited to 'sound/soc/amd')
-rw-r--r--sound/soc/amd/yc/acp6x-mach.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index b16587d8f97a..a7637056972a 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -252,6 +252,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {
.driver_data = &acp6x_card,
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "21M6"),
+ }
+ },
+ {
+ .driver_data = &acp6x_card,
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "21ME"),
}
},