diff options
| author | Mark Brown <broonie@kernel.org> | 2024-09-29 23:34:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-09-29 23:34:33 +0100 |
| commit | 46f2dd5ce5723a2c07051d332f8f1c4c4ce548f3 (patch) | |
| tree | fd9936eb06ef6d9f0383247afad3fc878187d4d8 /sound/soc/amd | |
| parent | 9852d85ec9d492ebef56dc5f229416c925758edc (diff) | |
| parent | e249786b2188107a7c50e7174d35f955a60988a1 (diff) | |
Merge existing fixes from asoc/for-6.12 into new branch
Diffstat (limited to 'sound/soc/amd')
| -rw-r--r-- | sound/soc/amd/acp/acp-sdw-sof-mach.c | 5 | ||||
| -rw-r--r-- | sound/soc/amd/yc/acp6x-mach.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sound/soc/amd/acp/acp-sdw-sof-mach.c b/sound/soc/amd/acp/acp-sdw-sof-mach.c index 6c50c8276538..306854fb08e3 100644 --- a/sound/soc/amd/acp/acp-sdw-sof-mach.c +++ b/sound/soc/amd/acp/acp-sdw-sof-mach.c @@ -400,9 +400,6 @@ err_dai: return ret; } -/* SoC card */ -static const char sdw_card_long_name[] = "AMD Soundwire SOF"; - static int mc_probe(struct platform_device *pdev) { struct snd_soc_acpi_mach *mach = dev_get_platdata(&pdev->dev); @@ -463,8 +460,6 @@ static int mc_probe(struct platform_device *pdev) if (!card->components) return -ENOMEM; - card->long_name = sdw_card_long_name; - /* Register the card */ ret = devm_snd_soc_register_card(card->dev, card); if (ret) { diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c index 06349bf0b658..ace6328e91e3 100644 --- a/sound/soc/amd/yc/acp6x-mach.c +++ b/sound/soc/amd/yc/acp6x-mach.c @@ -448,6 +448,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { .driver_data = &acp6x_card, .matches = { DMI_MATCH(DMI_BOARD_VENDOR, "HP"), + DMI_MATCH(DMI_BOARD_NAME, "8A7F"), + } + }, + { + .driver_data = &acp6x_card, + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "HP"), DMI_MATCH(DMI_BOARD_NAME, "8B27"), } }, |