ASoC: Intel: soc-acpi: remove TGL RVP mixed SoundWire/TDM config

The TGL RVP can be configured in many ways. We initially supported a
mixed configuration with RT711 in SoundWire mode and RT1308 in
TDM mode.

However Intel teams no longer have any hardware with this
configuration and there are no commercially-available devices using it
either, so let's remove this entry. The corresponding topology will
also be removed from the SOF tree.

This patch partially reverts Commit d985d208bf8f ("ASoC: Intel: common: add match tables for TGL w/ SoundWire")

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Link: https://lore.kernel.org/r/20210301235637.1177525-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 e8640ee100126e343e9f4b80a9d2fc6488b3adb7..b5f05b81a584d5fbef85fb8a9f8e72a5a26d4d38 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -182,15 +182,6 @@ static const struct snd_soc_acpi_adr_device rt714_3_adr[] = {
        }
 };
 
-static const struct snd_soc_acpi_link_adr tgl_i2s_rt1308[] = {
-       {
-               .mask = BIT(0),
-               .num_adr = ARRAY_SIZE(rt711_0_adr),
-               .adr_d = rt711_0_adr,
-       },
-       {}
-};
-
 static const struct snd_soc_acpi_link_adr tgl_rvp[] = {
        {
                .mask = BIT(0),
@@ -330,14 +321,6 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = {
 };
 
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
-       {
-               .id = "10EC1308",
-               .drv_name = "sof_sdw",
-               .link_mask = 0x1, /* RT711 on SoundWire link0 */
-               .links = tgl_i2s_rt1308,
-               .sof_fw_filename = "sof-tgl.ri",
-               .sof_tplg_filename = "sof-tgl-rt711-i2s-rt1308.tplg",
-       },
        {
                .id = "10EC5682",
                .drv_name = "tgl_max98357a_rt5682",