ASoC: wm_adsp: Add support for loading bin files without wmfw

A self-booted DSP may have a file of coefficients to apply to the device
even when there is no firmware to download.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20230320112245.115720-7-rf@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index d4bffa2..c23c306 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -850,8 +850,29 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp,
                return 0;
        }
 
-       if (dsp->wmfw_optional)
+       if (dsp->wmfw_optional) {
+               if (system_name) {
+                       if (asoc_component_prefix)
+                               wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
+                                                             cirrus_dir, system_name,
+                                                             asoc_component_prefix, "bin");
+
+                       if (!*coeff_firmware)
+                               wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
+                                                             cirrus_dir, system_name,
+                                                             NULL, "bin");
+               }
+
+               if (!*coeff_firmware)
+                       wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
+                                                     "", NULL, NULL, "bin");
+
+               if (!*coeff_firmware)
+                       wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,
+                                                     cirrus_dir, NULL, NULL, "bin");
+
                return 0;
+       }
 
        adsp_err(dsp, "Failed to request firmware <%s>%s-%s-%s<-%s<%s>>.wmfw\n",
                 cirrus_dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file,