diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-13 00:19:56 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-13 00:36:10 +0300 |
| commit | 9185a24cc5f7f3a0890836801b41c7bc08eb0781 (patch) | |
| tree | 07b3135a8d483ec9de007b2f4719ccc0175c0327 /sound | |
| parent | e786aef0869c711a70680d315ac2b838f03448ed (diff) | |
| download | linux-9185a24cc5f7f3a0890836801b41c7bc08eb0781.tar.gz | |
Revert "ASoC: amd: Add new dmi entries to config entry"
There is a conflict of commit
6ee2e59f8dc5 ("ASoC: amd: Add new dmi entries to config entry")
found in 6.1/features/amd-staging-drm-next, with the commit
a7d4d28d2c0b ("ASoC: amd: vangogh: Add check for acp config flags in vangogh platform")
introduced in v6.1.47.
The problem is that the acp5x sound card is not being probed anymore.
Most likely the commit was experimental, as it assumes there is
functional SOF support for Jupiter board, which is not the case.
Also note v6.6-rc1 provides a similar patch, but with a completely
different content:
197b1f7f0df1 ("ASoC: amd: Add new dmi entries to config entry")
Fix the issue by reverting the faulty commit.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/amd/acp-config.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c index 619a030de436..e8a357c8f997 100644 --- a/sound/soc/amd/acp-config.c +++ b/sound/soc/amd/acp-config.c @@ -31,10 +31,6 @@ static const struct config_entry config_table[] = { DMI_MATCH(DMI_SYS_VENDOR, "AMD"), DMI_MATCH(DMI_PRODUCT_NAME, "Majolica-CZN"), }, - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Valve"), - DMI_MATCH(DMI_PRODUCT_NAME, "Jupiter"), - }, }, {} }, |