openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191111222901.19892-4-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2019-11-11 16:29:01 -06:00 committed by Mark Brown
parent 1f24d93c4f
commit 0af237d51a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/soc/sof/intel/hda.c
View File

@ -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);