ASoC: Intel: soc-acpi: add support for SoundWire of TGL-H-RVP

snd_soc_acpi_intel_tgl_sdw_machines structure array does not contain
the configuration information of TGL-H-RVP, which results in the
inability to enable soundwire on the TGL-H-RVP platform.

Add the corresponding configuration information to enable soundwire
on the TGL-H-RVP platform.

Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Gongjun Song <gongjun.song@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210625205042.65181-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-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 66595e3ab13f6a1433068357e6be0899c8ea7653..d9b8902658c79d264a0ae55e610ac51674759f3b 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -196,6 +196,15 @@ static const struct snd_soc_acpi_link_adr tgl_rvp[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr tgl_rvp_headset_only[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt711_0_adr),
+               .adr_d = rt711_0_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr tgl_hp[] = {
        {
                .mask = BIT(0),
@@ -398,6 +407,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .drv_name = "sof_sdw",
                .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",
        },
+       {
+               .link_mask = 0x1, /* rt711 on link 0 */
+               .links = tgl_rvp_headset_only,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-tgl-rt711.tplg",
+       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_tgl_sdw_machines);