[PATCH AUTOSEL 5.12 14/33] ASoC: AMD Renoir: Remove fix for DMI entry on Lenovo 2020 platforms

Sasha Levin
2021-06-15T15:49:20Z

From: Mark Pearson <markpearson@lenovo.com>

[ Upstream commit 320232caf1d8febea17312dab4b2dfe02e033520 ]

Unfortunately the previous patch to fix issues using the AMD ACP bridge
has the side effect of breaking the dmic in other cases and needs to be
reverted.

Removing the changes while we revisit the fix and find something better.
Apologies for the churn.

Suggested-by: Gabriel Craciunescu <unix.or.die@gmail.com>
Signed-off-by: Mark Pearson <markpearson@lenovo.com>
Link: https://lore.kernel.org/r/20210602171251.3243-1-markpearson@lenovo.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/soc/amd/renoir/rn-pci-acp3x.c | 35 -----------------------------
1 file changed, 35 deletions(-)

diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c
index 47a4dfd81a46..050a61fe9693 100644
--- a/sound/soc/amd/renoir/rn-pci-acp3x.c
+++ b/sound/soc/amd/renoir/rn-pci-acp3x.c
@@ -199,41 +199,6 @@ static const struct dmi_system_id rn_acp_quirk_table[] = {
DMI_EXACT_MATCH(DMI_BOARD_NAME, "20NLCTO1WW"),
}
},
- {
- /* Lenovo ThinkPad P14s Gen 1 (20Y1) */
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_BOARD_NAME, "20Y1"),
- }
- },
- {
- /* Lenovo ThinkPad T14s Gen1 */
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_BOARD_NAME, "20UH"),
- }
- },
- {
- /* Lenovo ThinkPad T14s Gen1 Campus */
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_BOARD_NAME, "20UJ"),
- }
- },
- {
- /* Lenovo ThinkPad T14 Gen 1*/
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_BOARD_NAME, "20UD"),
- }
- },
- {
- /* Lenovo ThinkPad X13 Gen 1*/
- .matches = {
- DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
- DMI_MATCH(DMI_BOARD_NAME, "20UF"),
- }
- },
{}
};

--
2.30.2