aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/intel/common
diff options
context:
space:
mode:
authorGravatar Mark Brown <broonie@kernel.org> 2022-11-29 12:55:12 +0000
committerGravatar Mark Brown <broonie@kernel.org> 2022-11-29 12:55:51 +0000
commitaeb2e9c4eedc6fed264a51ca2ea17c83984d2a64 (patch)
tree3d80758082c0a3bc293761cc1a4cbac2e457b128 /sound/soc/intel/common
parentASoC: qcom: lpass-sc7180: Delete redundant error log from _resume() (diff)
parentASoC: cs42l51: Correct PGA Volume minimum value (diff)
downloadlinux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.gz
linux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.bz2
linux-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.zip
ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
Diffstat (limited to 'sound/soc/intel/common')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-icl-match.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
index b032bc07de8b..d0062f2cd256 100644
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -10,6 +10,11 @@
#include <sound/soc-acpi-intel-match.h>
#include "../skylake/skl.h"
+static const struct snd_soc_acpi_codecs essx_83x6 = {
+ .num_codecs = 3,
+ .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
+};
+
static struct skl_machine_pdata icl_pdata = {
.use_tplg_pcm = true,
};
@@ -27,6 +32,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
.drv_name = "sof_rt5682",
.sof_tplg_filename = "sof-icl-rt5682.tplg",
},
+ {
+ .comp_ids = &essx_83x6,
+ .drv_name = "sof-essx8336",
+ .sof_tplg_filename = "sof-icl-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_icl_machines);