On Wed, Mar 29, 2023 at 09:05:25PM +0800, Jianhua Lu wrote:
For platform using fdt, system_name is NULL, it doesn't provide a way to load firmware with prefix name, so add it.
Signed-off-by: Jianhua Lu lujianhua000@gmail.com
sound/soc/codecs/wm_adsp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 216120b68b64..17481e42d440 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -760,6 +760,10 @@ static int wm_adsp_request_firmware_file(struct wm_adsp *dsp, *filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part, dsp->fwf_name, wm_adsp_fw[dsp->fw].file, system_name, filetype);
- else if (asoc_component_prefix)
*filename = kasprintf(GFP_KERNEL, "%s%s-%s-%s-%s.%s", dir, dsp->part,dsp->fwf_name, wm_adsp_fw[dsp->fw].file, asoc_component_prefix,filetype);@@ -831,6 +835,16 @@ static int wm_adsp_request_firmware_files(struct wm_adsp *dsp, NULL, "bin"); return 0; }
- } else if (asoc_component_prefix) {
if (!wm_adsp_request_firmware_file(dsp, wmfw_firmware, wmfw_filename,cirrus_dir, NULL,asoc_component_prefix, "wmfw")) {adsp_dbg(dsp, "Found '%s'\n", *wmfw_filename);wm_adsp_request_firmware_file(dsp, coeff_firmware, coeff_filename,cirrus_dir, NULL,asoc_component_prefix, "bin");return 0;}
This direction seems slightly problematic, especially in the context of amps (which I presume this relates to, please let know if that is wrong). It would probably be better to be fixing things up such that the amp in question sets system_name when registered through DT. Generally speaking the idea is the amp tuning is going to be specific to the enclosure/speaker involved, so a generic tuning for say left amps doesn't really make a lot of sense.
Thanks, Charles