ASoC: Intel: soc-acpi-intel-tgl-match: add rt712 ID

Add rt712 ID for TGL.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230602202225.249209-12-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 ef19150..5804926 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -41,6 +41,21 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1,
 };
 
+static const struct snd_soc_acpi_endpoint rt712_endpoints[] = {
+       {
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       {
+               .num = 1,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
        {
                .adr = 0x000020025D071100ull,
@@ -170,6 +185,24 @@ static const struct snd_soc_acpi_adr_device rt1316_1_single_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device rt712_0_single_adr[] = {
+       {
+               .adr = 0x000030025D071201ull,
+               .num_endpoints = ARRAY_SIZE(rt712_endpoints),
+               .endpoints = rt712_endpoints,
+               .name_prefix = "rt712"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device rt1712_1_single_adr[] = {
+       {
+               .adr = 0x000130025D171201ull,
+               .num_endpoints = 1,
+               .endpoints = &single_endpoint,
+               .name_prefix = "rt712-dmic"
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt1316_1_group1_adr[] = {
        {
                .adr = 0x000131025D131601ull, /* unique ID is set for some reason */
@@ -353,6 +386,20 @@ static const struct snd_soc_acpi_link_adr tgl_3_in_1_sdca_mono[] = {
        {}
 };
 
+static const struct snd_soc_acpi_link_adr tgl_712_only[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt712_0_single_adr),
+               .adr_d = rt712_0_single_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1712_1_single_adr),
+               .adr_d = rt1712_1_single_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_codecs tgl_max98373_amp = {
        .num_codecs = 1,
        .codecs = {"MX98373"}
@@ -436,6 +483,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg",
        },
        {
+               .link_mask = 0xF, /* 4 active links required */
+               .links = tgl_712_only,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-tgl-rt712.tplg",
+       },
+       {
                .link_mask = 0x7,
                .links = tgl_sdw_rt711_link1_rt1308_link2_rt715_link0,
                .drv_name = "sof_sdw",