mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 10:32:54 +00:00
69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
|
From 6de8fe7791362d1db4c0bfcb0629ac192ae63af0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Muralidhar Reddy <muralidhar.reddy@intel.com>
|
||
|
|
Date: Mon, 25 Jul 2022 14:49:01 -0500
|
||
|
|
Subject: [PATCH 435/435] ASoC: Intel: soc-acpi: Add entry for sof_es8336 in
|
||
|
|
ADL match table
|
||
|
|
|
||
|
|
Adding support for ES83x6 codec in ADL match table
|
||
|
|
|
||
|
|
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
|
||
|
|
Signed-off-by: Muralidhar Reddy <muralidhar.reddy@intel.com>
|
||
|
|
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/20220725194909.145418-3-pierre-louis.bossart@linux.intel.com
|
||
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
||
|
|
---
|
||
|
|
sound/hda/intel-dsp-config.c | 5 +++++
|
||
|
|
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 13 +++++++++++++
|
||
|
|
2 files changed, 18 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
|
||
|
|
index 3257dc8a3..08390a029 100644
|
||
|
|
--- a/sound/hda/intel-dsp-config.c
|
||
|
|
+++ b/sound/hda/intel-dsp-config.c
|
||
|
|
@@ -379,6 +379,11 @@ static const struct config_entry config_table[] = {
|
||
|
|
.device = 0x7a50,
|
||
|
|
},
|
||
|
|
/* Alderlake-P */
|
||
|
|
+ {
|
||
|
|
+ .flags = FLAG_SOF,
|
||
|
|
+ .device = 0x51c8,
|
||
|
|
+ .codec_hid = &essx_83x6,
|
||
|
|
+ },
|
||
|
|
{
|
||
|
|
.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,
|
||
|
|
.device = 0x51c8,
|
||
|
|
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
|
||
|
|
index ca5a34471..8d76dc6f3 100644
|
||
|
|
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
|
||
|
|
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
|
||
|
|
@@ -8,6 +8,11 @@
|
||
|
|
#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_endpoint single_endpoint = {
|
||
|
|
.num = 0,
|
||
|
|
.aggregated = 0,
|
||
|
|
@@ -352,6 +357,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
|
||
|
|
.sof_fw_filename = "sof-adl.ri",
|
||
|
|
.sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
|
||
|
|
},
|
||
|
|
+ {
|
||
|
|
+ .comp_ids = &essx_83x6,
|
||
|
|
+ .drv_name = "sof-essx8336",
|
||
|
|
+ .sof_tplg_filename = "sof-adl-es83x6", /* 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_adl_sdw_machines);
|
||
|
|
--
|
||
|
|
2.35.2
|
||
|
|
|