Commit 0af237d5 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: SOF: Intel: hda: use fallback for firmware name

We have platforms such as CFL with no known I2S codec being used, and
the ACPI tables are currently empty, so fall-back to using the
firmware filename used in nocodec mode
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191111222901.19892-4-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1f24d93c
...@@ -415,9 +415,16 @@ static int hda_init_caps(struct snd_sof_dev *sdev) ...@@ -415,9 +415,16 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
pdata->tplg_filename = pdata->tplg_filename =
hda_mach->sof_tplg_filename; hda_mach->sof_tplg_filename;
/* firmware: pick the first in machine list */ /*
* firmware: pick the first in machine list,
* or use nocodec firmware name if list is empty
*/
mach = pdata->desc->machines; mach = pdata->desc->machines;
if (mach->id[0])
pdata->fw_filename = mach->sof_fw_filename; pdata->fw_filename = mach->sof_fw_filename;
else
pdata->fw_filename =
pdata->desc->nocodec_fw_filename;
dev_info(bus->dev, "using HDA machine driver %s now\n", dev_info(bus->dev, "using HDA machine driver %s now\n",
hda_mach->drv_name); hda_mach->drv_name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment