]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: codecs: aw88166: Support device specific firmware
authorTeguh Sobirin <teguh@sobir.in>
Wed, 11 Mar 2026 17:41:20 +0000 (12:41 -0500)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2026 01:13:57 +0000 (01:13 +0000)
This driver currently loads firmware from a hardcoded path. Support
loading device specific firmware when provided by the boot firmware.

Signed-off-by: Teguh Sobirin <teguh@sobir.in>
Co-developed-by: Aaron Kling <webgeek1234@gmail.com>
Signed-off-by: Aaron Kling <webgeek1234@gmail.com>
Link: https://patch.msgid.link/20260311-aw88166-fw-v2-1-8ef30dae3657@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/aw88166.c

index daee4de9e3b01fb335975a65456cc79575533d7e..ea277a940c44dfbf033ed4a69051bf506252b1c8 100644 (file)
@@ -1574,18 +1574,22 @@ static int aw88166_dev_init(struct aw88166 *aw88166, struct aw_container *aw_cfg
 static int aw88166_request_firmware_file(struct aw88166 *aw88166)
 {
        const struct firmware *cont = NULL;
+       const char *fw_name;
        int ret;
 
        aw88166->aw_pa->fw_status = AW88166_DEV_FW_FAILED;
 
-       ret = request_firmware(&cont, AW88166_ACF_FILE, aw88166->aw_pa->dev);
+       if (device_property_read_string(aw88166->aw_pa->dev, "firmware-name", &fw_name) < 0)
+               fw_name = AW88166_ACF_FILE;
+
+       ret = request_firmware(&cont, fw_name, aw88166->aw_pa->dev);
        if (ret) {
-               dev_err(aw88166->aw_pa->dev, "request [%s] failed!\n", AW88166_ACF_FILE);
+               dev_err(aw88166->aw_pa->dev, "request [%s] failed!\n", fw_name);
                return ret;
        }
 
        dev_dbg(aw88166->aw_pa->dev, "loaded %s - size: %zu\n",
-                       AW88166_ACF_FILE, cont ? cont->size : 0);
+                       fw_name, cont ? cont->size : 0);
 
        aw88166->aw_cfg = devm_kzalloc(aw88166->aw_pa->dev,
                        struct_size(aw88166->aw_cfg, data, cont->size), GFP_KERNEL);
@@ -1599,7 +1603,7 @@ static int aw88166_request_firmware_file(struct aw88166 *aw88166)
 
        ret = aw88395_dev_load_acf_check(aw88166->aw_pa, aw88166->aw_cfg);
        if (ret) {
-               dev_err(aw88166->aw_pa->dev, "load [%s] failed!\n", AW88166_ACF_FILE);
+               dev_err(aw88166->aw_pa->dev, "load [%s] failed!\n", fw_name);
                return ret;
        }