mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 21:14:44 +08:00
486ede0df8
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>
69 lines
1.8 KiB
C
69 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* soc-acpi-intel-glk-match.c - tables and support for GLK ACPI enumeration.
|
|
*
|
|
* Copyright (c) 2018, Intel Corporation.
|
|
*
|
|
*/
|
|
|
|
#include <sound/soc-acpi.h>
|
|
#include <sound/soc-acpi-intel-match.h>
|
|
|
|
static const struct snd_soc_acpi_codecs essx_83x6 = {
|
|
.num_codecs = 3,
|
|
.codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
|
|
};
|
|
|
|
static const struct snd_soc_acpi_codecs glk_codecs = {
|
|
.num_codecs = 1,
|
|
.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[] = {
|
|
{
|
|
.id = "INT343A",
|
|
.drv_name = "glk_alc298s_i2s",
|
|
.fw_filename = "intel/dsp_fw_glk.bin",
|
|
.sof_tplg_filename = "sof-glk-alc298.tplg",
|
|
},
|
|
{
|
|
.id = "DLGS7219",
|
|
.drv_name = "glk_da7219_mx98357a",
|
|
.fw_filename = "intel/dsp_fw_glk.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &glk_codecs,
|
|
.sof_tplg_filename = "sof-glk-da7219.tplg",
|
|
},
|
|
{
|
|
.comp_ids = &glk_rt5682_rt5682s_hp,
|
|
.drv_name = "glk_rt5682_mx98357a",
|
|
.fw_filename = "intel/dsp_fw_glk.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &glk_codecs,
|
|
.sof_tplg_filename = "sof-glk-rt5682.tplg",
|
|
},
|
|
{
|
|
.id = "10134242",
|
|
.drv_name = "glk_cs4242_mx98357a",
|
|
.fw_filename = "intel/dsp_fw_glk.bin",
|
|
.machine_quirk = snd_soc_acpi_codec_list,
|
|
.quirk_data = &glk_codecs,
|
|
.sof_tplg_filename = "sof-glk-cs42l42.tplg",
|
|
},
|
|
{
|
|
.comp_ids = &essx_83x6,
|
|
.drv_name = "sof-essx8336",
|
|
.sof_tplg_filename = "sof-glk-es8336", /* the tplg suffix is added at run time */
|
|
.tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_SSP_NUMBER |
|
|
SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
|
|
SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
|
|
},
|
|
{},
|
|
};
|
|
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_glk_machines);
|