ASoC: Intel: adl: remove sof_fw_filename setting in ADL snd_soc_acpi_mach
authorLibin Yang <libin.yang@intel.com>
Mon, 25 Jan 2021 07:05:00 +0000 (09:05 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 27 Jan 2021 17:28:28 +0000 (17:28 +0000)
ADL will use sof-adl-s.ri if it is ADL-S platform. So let's use
the default_fw_filename in pdata->desc for the ADL FW filename.

Signed-off-by: Libin Yang <libin.yang@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210125070500.807474-3-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-adl-match.c

index 06b233d..0aca340 100644 (file)
@@ -44,7 +44,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
                .link_mask = 0x1, /* link0 required */
                .links = adl_rvp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt711.tplg",
        },
        {},