diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
| commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
| tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/intel/common/soc-acpi-intel-tgl-match.c | |
| parent | 6395a6213b8367bb55c3b940f663eda772d7c19c (diff) | |
| parent | b976a5adf32eee7db928b5b77cffa3b008ebf2ff (diff) | |
| download | linux-stable-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.tar.gz linux-stable-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.tar.bz2 linux-stable-2927e6d398d0fca52d8f011a89dcfcabb2b1abfd.zip | |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/intel/common/soc-acpi-intel-tgl-match.c')
| -rw-r--r-- | sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 7 |
1 files changed, 0 insertions, 7 deletions
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 ee25451dfdd0..e3ddbf05bf72 100644 --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c @@ -358,14 +358,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { .link_mask = 0x7, .links = tgl_sdw_rt711_link1_rt1308_link2_rt715_link0, .drv_name = "sof_sdw", - .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg", }, { .link_mask = 0xF, /* 4 active links required */ .links = tgl_3_in_1_default, .drv_name = "sof_sdw", - .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-rt711-rt1308-rt715.tplg", }, { @@ -377,35 +375,30 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { .link_mask = 0xF, .links = tgl_3_in_1_mono_amp, .drv_name = "sof_sdw", - .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-rt711-rt1308-mono-rt715.tplg", }, { .link_mask = 0xF, /* 4 active links required */ .links = tgl_3_in_1_sdca, .drv_name = "sof_sdw", - .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-rt711-rt1316-rt714.tplg", }, { .link_mask = 0x3, /* rt711 on link 0 and 2 rt1308s on link 1 */ .links = tgl_rvp, .drv_name = "sof_sdw", - .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, .drv_name = "sof_sdw", - .sof_fw_filename = "sof-tgl.ri", .sof_tplg_filename = "sof-tgl-rt5682.tplg", }, {}, |