Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Pierre-Louis Bossart and committed by
Mark Brown
0af237d5 1f24d93c

+9 -2
+9 -2
sound/soc/sof/intel/hda.c
··· 415 415 pdata->tplg_filename = 416 416 hda_mach->sof_tplg_filename; 417 417 418 - /* firmware: pick the first in machine list */ 418 + /* 419 + * firmware: pick the first in machine list, 420 + * or use nocodec firmware name if list is empty 421 + */ 419 422 mach = pdata->desc->machines; 420 - pdata->fw_filename = mach->sof_fw_filename; 423 + if (mach->id[0]) 424 + pdata->fw_filename = mach->sof_fw_filename; 425 + else 426 + pdata->fw_filename = 427 + pdata->desc->nocodec_fw_filename; 421 428 422 429 dev_info(bus->dev, "using HDA machine driver %s now\n", 423 430 hda_mach->drv_name);