summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/common/soc-acpi-intel-cml-match.c
diff options
context:
space:
mode:
authorBrent Lu <brent.lu@intel.com>2020-10-31 01:05:58 +0800
committerMark Brown <broonie@kernel.org>2020-10-30 18:29:01 +0000
commit35249a5684fd01377bb40e20b8a604774cb073d8 (patch)
tree03e67437614ab47e8e671c19d4dd0846154878af /sound/soc/intel/common/soc-acpi-intel-cml-match.c
parentec6869b096f10526df14d9972a60ebffef72f0b9 (diff)
downloadlinux-stable-35249a5684fd01377bb40e20b8a604774cb073d8.tar.gz
linux-stable-35249a5684fd01377bb40e20b8a604774cb073d8.tar.bz2
linux-stable-35249a5684fd01377bb40e20b8a604774cb073d8.zip
ASoC: intel: sof_rt5682: Add support for cml_rt1015_rt5682
This patch adds the driver data and updates quirk info for cml with rt1015 speaker amp and rt5682 headset codec. Due to different mclk frequency on JSL and CML, we need to use 4 slot TDM 100fs to avoid the SSP m/n counter. Signed-off-by: Brent Lu <brent.lu@intel.com> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20201030170559.20370-2-brent.lu@intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-cml-match.c')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-cml-match.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 26dde88bb227..adddc91918df 100644
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -14,6 +14,11 @@ static struct snd_soc_acpi_codecs rt1011_spk_codecs = {
.codecs = {"10EC1011"}
};
+static struct snd_soc_acpi_codecs rt1015_spk_codecs = {
+ .num_codecs = 1,
+ .codecs = {"10EC1015"}
+};
+
static struct snd_soc_acpi_codecs max98357a_spk_codecs = {
.num_codecs = 1,
.codecs = {"MX98357A"}
@@ -40,6 +45,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
},
{
.id = "10EC5682",
+ .drv_name = "cml_rt1015_rt5682",
+ .machine_quirk = snd_soc_acpi_codec_list,
+ .quirk_data = &rt1015_spk_codecs,
+ .sof_fw_filename = "sof-cml.ri",
+ .sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
+ },
+ {
+ .id = "10EC5682",
.drv_name = "sof_rt5682",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &max98357a_spk_codecs,