ASoC: Intel: soc-acpi: update topology and driver name for SoundWire platforms

Update topology and reflect change to unified machine driver for SoundWire.

Signed-off-by: Rander Wang <rander.wang@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200325220746.29601-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 3525da7..bcedec6 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -80,6 +80,23 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1,
 };
 
+static const struct snd_soc_acpi_adr_device rt700_1_adr[] = {
+       {
+               .adr = 0x000110025D070000,
+               .num_endpoints = 1,
+               .endpoints = &single_endpoint,
+       }
+};
+
+static const struct snd_soc_acpi_link_adr cml_rvp[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt700_1_adr),
+               .adr_d = rt700_1_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_adr_device rt711_0_adr[] = {
        {
                .adr = 0x000010025D071100,
@@ -175,7 +192,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[] = {
        {
                .link_mask = 0xF, /* 4 active links required */
                .links = cml_3_in_1_default,
-               .drv_name = "sdw_rt711_rt1308_rt715",
+               .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-rt715.tplg",
        },
@@ -187,13 +204,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[] = {
                 */
                .link_mask = 0xF,
                .links = cml_3_in_1_mono_amp,
-               .drv_name = "sdw_rt711_rt1308_rt715",
+               .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-mono-rt715.tplg",
        },
        {
                .link_mask = 0x2, /* RT700 connected on Link1 */
-               .drv_name = "sdw_rt700",
+               .links = cml_rvp,
+               .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt700.tplg",
        },

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 a05fc08..ef85003 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -166,21 +166,21 @@ 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",
+               .drv_name = "sof_sdw",
                .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",
+               .drv_name = "sof_sdw",
                .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",
+               .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt700.tplg",
        },

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 3153b44..db360c9 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -87,11 +87,11 @@ static struct snd_soc_acpi_codecs tgl_max98373_amp = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
        {
                .id = "10EC1308",
-               .drv_name = "rt711_rt1308",
+               .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-rt1308.tplg",
+               .sof_tplg_filename = "sof-tgl-rt711-i2s-rt1308.tplg",
        },
        {
                .id = "10EC5682",
@@ -118,7 +118,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
        {
                .link_mask = 0x3, /* rt711 on link 0 and 2 rt1308s on link 1 */
                .links = tgl_rvp,
-               .drv_name = "sdw_rt711_rt1308_rt715",
+               .drv_name = "sof_sdw",
                .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt711-rt1308.tplg",
        },