瀏覽代碼

msm: eva: Reading FW ELF naming from device tree

          This change helps to read firmware elf name from device tree.

Change-Id: Idc5779063d386ceb0ed8435090a4a70c9651f19d
Signed-off-by: Gopireddy Arunteja Reddy <[email protected]>
Gopireddy Arunteja Reddy 1 年之前
父節點
當前提交
4b2e159565
共有 1 個文件被更改,包括 14 次插入4 次删除
  1. 14 4
      msm/eva/msm_cvp_res_parse.c

+ 14 - 4
msm/eva/msm_cvp_res_parse.c

@@ -326,6 +326,14 @@ err_qdss_addr_tbl:
 	return rc;
 }
 
+static int msm_cvp_load_fw_name(struct msm_cvp_platform_resources *res)
+{
+	struct platform_device *pdev = res->pdev;
+
+	return of_property_read_string_index(pdev->dev.of_node,
+				"cvp,firmware-name", 0, &res->fw_name);
+}
+
 static int msm_cvp_load_subcache_info(struct msm_cvp_platform_resources *res)
 {
 	int rc = 0, num_subcaches = 0, c;
@@ -830,10 +838,6 @@ int cvp_read_platform_resources_from_drv_data(
 
 	res->sku_version = platform_data->sku_version;
 
-	res->fw_name = "evass";
-
-	dprintk(CVP_CORE, "Firmware filename: %s\n", res->fw_name);
-
 	res->dsp_enabled = find_key_value(platform_data,
 			"qcom,dsp-enabled");
 
@@ -912,6 +916,12 @@ int cvp_read_platform_resources_from_dt(
 
 	dprintk(CVP_CORE, "%s: res->irq_wd:%d \n",
 		__func__, res->irq_wd);
+
+	rc = msm_cvp_load_fw_name(res);
+	dprintk(CVP_CORE, "Firmware filename: %s\n", res->fw_name);
+	if (rc)
+		dprintk(CVP_WARN, "Failed to load fw name info: %d\n", rc);
+
 	rc = msm_cvp_load_subcache_info(res);
 	if (rc)
 		dprintk(CVP_WARN, "Failed to load subcache info: %d\n", rc);