ASoC: Intel: soc-acpi: rt713+rt1316, no sdw-dmic config

This is additional HW board: rt713+rt1316 without rt713-dmic configuration:

SDW0: rt713 audio jack
SDW1: rt1316 spk_amp_l
SDW2: rt1316 spk_amp_r

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231127133448.18449-5-peter.ujfalusi@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 301b8142d554cba01c270ee3793761786e4eb59b..61f2b264549632fc47ca71cfa3a4ba11e48718f7 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -422,6 +422,25 @@ static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12_rt1713_l3[] =
        {}
 };
 
+static const struct snd_soc_acpi_link_adr mtl_rt713_l0_rt1316_l12[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt713_0_single_adr),
+               .adr_d = rt713_0_single_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1316_1_group2_adr),
+               .adr_d = rt1316_1_group2_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(rt1316_2_group2_adr),
+               .adr_d = rt1316_2_group2_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_adr_device mx8363_2_adr[] = {
        {
                .adr = 0x000230019F836300ull,
@@ -507,6 +526,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12-rt1713-l3.tplg",
        },
+       {
+               .link_mask = GENMASK(2, 0),
+               .links = mtl_rt713_l0_rt1316_l12,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12.tplg",
+       },
        {
                .link_mask = BIT(3) | BIT(0),
                .links = mtl_712_only,