Skip to content

Commit

Permalink
ASoC: SOF: Intel: hda: use fallback for firmware name
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
plbossart committed Nov 1, 2019
1 parent fd5f04d commit 1cae799
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions sound/soc/sof/intel/hda.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,16 @@ static int hda_init_caps(struct snd_sof_dev *sdev)
pdata->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;
pdata->fw_filename = mach->sof_fw_filename;
if (mach->id[0])
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",
hda_mach->drv_name);
Expand Down

0 comments on commit 1cae799

Please sign in to comment.