ASoC: Intel: common: add match table for TGL MAX98373 + RT5682 SoundWire driver

RT5682 is in Soundwire mode on Link0 & 2x MAX98373 on link1.

Signed-off-by: Naveen Manohar <naveen.m@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Link: https://lore.kernel.org/r/20200625192708.4416-1-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 5a56f43594799c1898ff195361ef25668fd324d2..2ffa608d987dd0b3c06d7695f00b2d03ceef2c72 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -56,6 +56,19 @@ static const struct snd_soc_acpi_adr_device rt1308_1_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_adr_device mx8373_1_adr[] = {
+       {
+               .adr = 0x000123019F837300,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+       },
+       {
+               .adr = 0x000127019F837300,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+       }
+};
+
 static const struct snd_soc_acpi_adr_device rt5682_0_adr[] = {
        {
                .adr = 0x000021025D568200,
@@ -93,6 +106,11 @@ static const struct snd_soc_acpi_link_adr tgl_chromebook_base[] = {
                .num_adr = ARRAY_SIZE(rt5682_0_adr),
                .adr_d = rt5682_0_adr,
        },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(mx8373_1_adr),
+               .adr_d = mx8373_1_adr,
+       },
        {}
 };
 
@@ -139,6 +157,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt711-rt1308.tplg",
        },
+       {
+               .link_mask = 0x3, /* rt5682 on link0 & 2xmax98373 on link 1 */
+               .links = tgl_chromebook_base,
+               .drv_name = "sof_sdw",
+               .sof_fw_filename = "sof-tgl.ri",
+               .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",
+       },
        {
                .link_mask = 0x1, /* this will only enable rt5682 for now */
                .links = tgl_chromebook_base,