ASoC: Intel: common: add match tables for ICL w/ SoundWire

The two configurations are with the Realtek 3-in-1 board requiring all
4 links to be enabled, or basic configuration with the on-board RT700
using link0.

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/20200110222530.30303-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
index 38977669b576539035a4edbafcd34924eed3dd64..67e9da4635f2541151d6776bdb0d9f0dbcb49133 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -33,5 +33,103 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_machines);
 
+static const u64 rt700_0_adr[] = {
+       0x000010025D070000
+};
+
+static const struct snd_soc_acpi_link_adr icl_rvp[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt700_0_adr),
+               .adr = rt700_0_adr,
+       },
+       {}
+};
+
+static const u64 rt711_0_adr[] = {
+       0x000010025D071100
+};
+
+static const u64 rt1308_1_adr[] = {
+       0x000110025D130800
+};
+
+static const u64 rt1308_2_adr[] = {
+       0x000210025D130800
+};
+
+static const u64 rt715_3_adr[] = {
+       0x000310025D715000
+};
+
+static const struct snd_soc_acpi_link_adr icl_3_in_1_default[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt711_0_adr),
+               .adr = rt711_0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1308_1_adr),
+               .adr = rt1308_1_adr,
+       },
+       {
+               .mask = BIT(2),
+               .num_adr = ARRAY_SIZE(rt1308_2_adr),
+               .adr = rt1308_2_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt715_3_adr),
+               .adr = rt715_3_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr icl_3_in_1_mono_amp[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(rt711_0_adr),
+               .adr = rt711_0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt1308_1_adr),
+               .adr = rt1308_1_adr,
+       },
+       {
+               .mask = BIT(3),
+               .num_adr = ARRAY_SIZE(rt715_3_adr),
+               .adr = rt715_3_adr,
+       },
+       {}
+};
+
+struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[] = {
+       {
+               .link_mask = 0xF, /* 4 active links required */
+               .links = icl_3_in_1_default,
+               .drv_name = "sdw_rt711_rt1308_rt715",
+               .sof_fw_filename = "sof-icl.ri",
+               .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715.tplg",
+       },
+       {
+               .link_mask = 0xB, /* 3 active links required */
+               .links = icl_3_in_1_mono_amp,
+               .drv_name = "sdw_rt711_rt1308_rt715",
+               .sof_fw_filename = "sof-icl.ri",
+               .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715-mono.tplg",
+       },
+       {
+               .link_mask = 0x1, /* rt700 connected on link0 */
+               .links = icl_rvp,
+               .drv_name = "sdw_rt700",
+               .sof_fw_filename = "sof-icl.ri",
+               .sof_tplg_filename = "sof-icl-rt700.tplg",
+       },
+       {},
+};
+EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_icl_sdw_machines);
+
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Intel Common ACPI Match module");