ASoC: Intel: soc-acpi: add support for HP Omen14 SoundWire configuration

This platform has an RT711-sdca on link0 and RT1316 on link3

Closes: https://github.com/thesofproject/linux/issues/4880
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240411220347.131267-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 75935b454e5df8a4746ab2cc649e5e7722629a40..264f5c19af56f1af74fce9267619ea1205d1bedf 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -296,6 +296,15 @@ static const struct snd_soc_acpi_adr_device rt1316_2_group2_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt1316_3_single_adr[] = {
+       {
+               .adr = 0x000330025D131601ull,
+               .num_endpoints = 1,
+               .endpoints = &single_endpoint,
+               .name_prefix = "rt1316-1"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt1318_1_group1_adr[] = {
        {
                .adr = 0x000130025D131801ull,
@@ -562,6 +571,20 @@ static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr mtl_rt711_l0_rt1316_l3[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt711_sdca_0_adr),
+               .adr_d = rt711_sdca_0_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt1316_3_single_adr),
+               .adr_d = rt1316_3_single_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
        {
                .adr = 0x000230019F836300ull,
@@ -703,6 +726,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l23-rt714-l1.tplg",
        },
+       {
+               .link_mask = 0x9, /* 2 active links required */
+               .links = mtl_rt711_l0_rt1316_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l3.tplg",
+       },
        {
                .link_mask = BIT(0),
                .links = mtl_rt722_only,