Skip to content

Commit 65a314b

Browse files
simontrimmerbroonie
authored andcommitted
ASoC: wm_adsp: Support DSPs that don't require firmware download
When a DSP can self-boot from ROM it is not necessary to download firmware - when the DSP has the wmfw_optional flag set not finding a wmfw firmware file is a successful outcome and not an error condition. Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Link: https://lore.kernel.org/r/167931140130.26.15590061696793062038@mailman-core.alsa-project.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 107c167 commit 65a314b

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

sound/soc/codecs/wm_adsp.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,9 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
850850
return 0;
851851
}
852852

853+
if (dsp->wmfw_optional)
854+
return 0;
855+
853856
adsp_err(dsp, "Failed to request firmware <%s>%s-%s-%s<-%s<%s>>.wmfw\n",
854857
cirrus_dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file,
855858
system_name, asoc_component_prefix);

sound/soc/codecs/wm_adsp.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ struct wm_adsp {
3434
unsigned int sys_config_size;
3535

3636
int fw;
37+
bool wmfw_optional;
3738

3839
struct work_struct boot_work;
3940
int (*pre_run)(struct wm_adsp *dsp);

0 commit comments

Comments
 (0)