summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorJiawei Wang <me@jwang.link>2024-03-13 09:58:52 +0800
committerMark Brown <broonie@kernel.org>2024-03-14 14:14:34 +0000
commit861b3415e4dee06cc00cd1754808a7827b9105bf (patch)
tree1b212c3265d354622092293d16483e88fcd2c3be /sound
parentc7c12024ebadbbfd98d82c06edabc41d568ad51a (diff)
downloadlinux-stable-861b3415e4dee06cc00cd1754808a7827b9105bf.tar.gz
linux-stable-861b3415e4dee06cc00cd1754808a7827b9105bf.tar.bz2
linux-stable-861b3415e4dee06cc00cd1754808a7827b9105bf.zip
ASoC: amd: yc: Revert "Fix non-functional mic on Lenovo 21J2"
This reverts commit ed00a6945dc32462c2d3744a3518d2316da66fcc, which added a quirk entry to enable the Yellow Carp (YC) driver for the Lenovo 21J2 laptop. Although the microphone functioned with the YC driver, it resulted in incorrect driver usage. The Lenovo 21J2 is not a Yellow Carp platform, but a Pink Sardine platform, which already has an upstreamed driver. The microphone on the Lenovo 21J2 operates correctly with the CONFIG_SND_SOC_AMD_PS flag enabled and does not require the quirk entry. So this patch removes the quirk entry. Thanks to Mukunda Vijendar [1] for pointing this out. Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1] Signed-off-by: Jiawei Wang <me@jwang.link> Link: https://lore.kernel.org/linux-sound/023092e1-689c-4b00-b93f-4092c3724fb6@amd.com/ [1] Link: https://msgid.link/r/20240313015853.3573242-2-me@jwang.link Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/amd/yc/acp6x-mach.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/amd/yc/acp6x-mach.c b/sound/soc/amd/yc/acp6x-mach.c
index 1ab69a53174e..69c68d8e7a6b 100644
--- a/sound/soc/amd/yc/acp6x-mach.c
+++ b/sound/soc/amd/yc/acp6x-mach.c
@@ -203,13 +203,6 @@ 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, "21J2"),
- }
- },
- {
- .driver_data = &acp6x_card,
- .matches = {
- DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_NAME, "21J0"),
}
},