diff options
| author | John Schoenick <johns@valvesoftware.com> | 2023-11-06 16:57:32 -0800 |
|---|---|---|
| committer | John Schoenick <johns@valvesoftware.com> | 2023-11-06 17:06:31 -0800 |
| commit | f4eb70d4436eda075739fdad809ab38ec27a6fa0 (patch) | |
| tree | db887f9b21949d993dbbd300d7387c4c97ed9796 /sound/soc | |
| parent | e76d3f9d84033ca087a3af68b752d7a393216bef (diff) | |
| download | linux-f4eb70d4436eda075739fdad809ab38ec27a6fa0.tar.gz | |
Revert "ASoC: amd: Fix shadowing of Majolica-CZN in quirks table"
This reverts commit bfcc5dc2cb01d06e64c53e00fb027c2c53c372e9. This cherry-pick is a merge accident -- independently resolved by 9185a24cc5f7f3a0890836801b41c7bc08eb0781, and the changes in the cherry-pick are unrelated to the upstream patch regardless.
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/amd/acp-config.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sound/soc/amd/acp-config.c b/sound/soc/amd/acp-config.c index 84974822aaaa..f27c27580009 100644 --- a/sound/soc/amd/acp-config.c +++ b/sound/soc/amd/acp-config.c @@ -96,11 +96,6 @@ static struct snd_soc_acpi_codecs amp_max = { .codecs = {"MX98360A"} }; -static struct snd_soc_acpi_codecs amp_cs35l41 = { - .num_codecs = 1, - .codecs = {"CLSA3541"} -}; - static struct snd_soc_acpi_codecs amp_max98388 = { .num_codecs = 1, .codecs = {"ADS8388"} @@ -154,16 +149,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[] = { }; EXPORT_SYMBOL(snd_soc_acpi_amd_sof_machines); -struct snd_soc_acpi_mach snd_soc_acpi_amd_vgh_sof_machines[] = { - { - .id = "NVTN2020", - .drv_name = "nau8821-cs3", - .pdata = &acp_quirk_data, - .machine_quirk = snd_soc_acpi_codec_list, - .quirk_data = &_cs35l41, - .fw_filename = "sof-vangogh.ri", - .sof_tplg_filename = "sof-vangogh-nau8821-cs35l41.tplg", - }, +struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[] = { { .id = "NVTN2020", .drv_name = "nau8821-max", @@ -175,7 +161,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_vgh_sof_machines[] = { }, {}, }; -EXPORT_SYMBOL(snd_soc_acpi_amd_vgh_sof_machines); +EXPORT_SYMBOL(snd_soc_acpi_amd_vangogh_sof_machines); struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[] = { { |