summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/common/soc-acpi-intel-icl-match.c
diff options
context:
space:
mode:
authorRander Wang <rander.wang@intel.com>2020-03-25 23:07:43 +0100
committerMark Brown <broonie@kernel.org>2020-03-27 18:11:54 +0100
commitba762e67c3f34660f6ac8299296dbc9e96720939 (patch)
tree1c18bd8d139f09cfecd59e8b1cef6bbac7ade923 /sound/soc/intel/common/soc-acpi-intel-icl-match.c
parentMerge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff)
downloadlinux-ba762e67c3f34660f6ac8299296dbc9e96720939.tar.xz
linux-ba762e67c3f34660f6ac8299296dbc9e96720939.zip
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>
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-icl-match.c')
-rw-r--r--sound/soc/intel/common/soc-acpi-intel-icl-match.c6
1 files changed, 3 insertions, 3 deletions
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 a05fc083829e..ef8500349f2f 100644
--- 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",
},