ASoC: Intel: soc-acpi: add more ACPI HIDs for ES83x6 devices

[ Upstream commit 1cedb6eabf0f2dd8285d3bb0ce1abd2369529084 ]

We only saw ESSX8336 so far, but now with reports of 'ESSX8326' we
need to expand to a full list. Let's reuse the 'snd_soc_acpi_codecs'
structure to store the information.

Note that ES8326 will need a dedicated codec driver, but the plan is
to use the same machine driver for all Everest Audio devices.

Reported-by: anthony tonitch <d.tonitch@gmail.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220308192610.392950-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
index 342d340522045489aeb18cee9fed70af5e0e8517..04a92e74d99bcb41831ef7f60a558cf0225714a8 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
@@ -41,6 +41,11 @@ static struct snd_soc_acpi_mach *apl_quirk(void *arg)
        return mach;
 }
 
+static const struct snd_soc_acpi_codecs essx_83x6 = {
+       .num_codecs = 3,
+       .codecs = { "ESSX8316", "ESSX8326", "ESSX8336"},
+};
+
 static const struct snd_soc_acpi_codecs bxt_codecs = {
        .num_codecs = 1,
        .codecs = {"MX98357A"}
@@ -83,7 +88,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
                .sof_tplg_filename = "sof-apl-tdf8532.tplg",
        },
        {
-               .id = "ESSX8336",
+               .comp_ids = &essx_83x6,
                .drv_name = "sof-essx8336",
                .sof_fw_filename = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-es8336.tplg",

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 4eebc79d4b486df60b07490e6f1cb19a8401f181..14395833d89e83f231bb9b98f7c8ab08984191c2 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -9,6 +9,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_codecs rt1011_spk_codecs = {
        .num_codecs = 1,
        .codecs = {"10EC1011"}
@@ -82,7 +87,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .sof_tplg_filename = "sof-cml-da7219-max98390.tplg",
        },
        {
-               .id = "ESSX8336",
+               .comp_ids = &essx_83x6,
                .drv_name = "sof-essx8336",
                .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-es8336.tplg",

diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index 8492b7e2a94500ad059aa8ca18f3cf420fd57688..7aa6a870d5a5c6bc536b98147a89d3d7473aefc3 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -9,6 +9,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_codecs glk_codecs = {
        .num_codecs = 1,
        .codecs = {"MX98357A"}
@@ -58,7 +63,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .sof_tplg_filename = "sof-glk-cs42l42.tplg",
        },
        {
-               .id = "ESSX8336",
+               .comp_ids = &essx_83x6,
                .drv_name = "sof-essx8336",
                .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-es8336.tplg",

diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index 278ec196da7bf4811334a7ada3be3994f1417173..9d0d0e1437a4b02b15275ec72b56cc761188c36c 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -9,6 +9,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_codecs jsl_7219_98373_codecs = {
        .num_codecs = 1,
        .codecs = {"MX98373"}
@@ -87,7 +92,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
                .sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg",
        },
        {
-               .id = "ESSX8336",
+               .comp_ids = &essx_83x6,
                .drv_name = "sof-essx8336",
                .sof_fw_filename = "sof-jsl.ri",
                .sof_tplg_filename = "sof-jsl-es8336.tplg",

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index da31bb3cca17cf2836b39d5fa5ccc428b72b8413..e2658bca693181217a4b8b3e8fc539f9de68ccea 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -10,6 +10,11 @@
 #include <sound/soc-acpi-intel-match.h>
 #include "soc-acpi-intel-sdw-mockup-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 tgl_codecs = {
        .num_codecs = 1,
        .codecs = {"MX98357A"}
@@ -389,7 +394,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg",
        },
        {
-               .id = "ESSX8336",
+               .comp_ids = &essx_83x6,
                .drv_name = "sof-essx8336",
                .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-es8336.tplg",