ASoC: Intel: tgl: remove sof_fw_filename set for tgl_3_in_1_default

[sfrench/cifs-2.6.git] / sound / soc / intel / common / soc-acpi-intel-tgl-match.c

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 98196e9fad62fc664e6b6463eb169c88187db0d3..711aed06c6ddc8cca633154eccf57ac7d99f4286 100644 (file)
--- 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",
        },
        {},