mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
ASoC: Intel: glk_rt5682_max98357a: fix board id mismatch
[ Upstream commit486ede0df8
] The drv_name in enumeration table for ALC5682I-VS codec does not match the board id string in machine driver. Modify the entry of "10EC5682" to enumerate "RTL5682" as well and remove invalid entry. Fixes:88b4d77d60
("ASoC: Intel: glk_rt5682_max98357a: support ALC5682I-VS codec") Reported-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Curtis Malainey <cujomalainey@chromium.org> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Brent Lu <brent.lu@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20231204214200.203100-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7682ef5c14
commit
c32ee7286f
1 changed files with 6 additions and 8 deletions
|
@ -19,6 +19,11 @@ static const struct snd_soc_acpi_codecs glk_codecs = {
|
||||||
.codecs = {"MX98357A"}
|
.codecs = {"MX98357A"}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct snd_soc_acpi_codecs glk_rt5682_rt5682s_hp = {
|
||||||
|
.num_codecs = 2,
|
||||||
|
.codecs = {"10EC5682", "RTL5682"},
|
||||||
|
};
|
||||||
|
|
||||||
struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
|
struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
|
||||||
{
|
{
|
||||||
.id = "INT343A",
|
.id = "INT343A",
|
||||||
|
@ -35,20 +40,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
|
||||||
.sof_tplg_filename = "sof-glk-da7219.tplg",
|
.sof_tplg_filename = "sof-glk-da7219.tplg",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.id = "10EC5682",
|
.comp_ids = &glk_rt5682_rt5682s_hp,
|
||||||
.drv_name = "glk_rt5682_mx98357a",
|
.drv_name = "glk_rt5682_mx98357a",
|
||||||
.fw_filename = "intel/dsp_fw_glk.bin",
|
.fw_filename = "intel/dsp_fw_glk.bin",
|
||||||
.machine_quirk = snd_soc_acpi_codec_list,
|
.machine_quirk = snd_soc_acpi_codec_list,
|
||||||
.quirk_data = &glk_codecs,
|
.quirk_data = &glk_codecs,
|
||||||
.sof_tplg_filename = "sof-glk-rt5682.tplg",
|
.sof_tplg_filename = "sof-glk-rt5682.tplg",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
.id = "RTL5682",
|
|
||||||
.drv_name = "glk_rt5682_max98357a",
|
|
||||||
.machine_quirk = snd_soc_acpi_codec_list,
|
|
||||||
.quirk_data = &glk_codecs,
|
|
||||||
.sof_tplg_filename = "sof-glk-rt5682.tplg",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
.id = "10134242",
|
.id = "10134242",
|
||||||
.drv_name = "glk_cs4242_mx98357a",
|
.drv_name = "glk_cs4242_mx98357a",
|
||||||
|
|
Loading…
Reference in a new issue