Skip to content

Commit 3dac889

Browse files
msm: camera: icp: Adapt to qcom_mdt_pas_load() API change
Update ICP firmware loading to match the updated qcom_mdt_pas_load() signature, which now accepts only four parameters instead of five. Remove the unused firmware carveout ioremap() and associated cleanup, as the virtual address parameter is no longer required. No functional change beyond aligning with the new API. CRs-Fixed: 4486628 Change-Id: I73741ac1cb2a20c7fc59f625ec7458c6fe09beac Signed-off-by: Ignatius Michael Jihan <mignatiu@qti.qualcomm.com>
1 parent fa64786 commit 3dac889

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

camera/drivers/cam_icp/icp_hw/icp_proc/icp_v2_hw/cam_icp_v2_core.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ typedef int (*qcom_mdt_pas_load_t)(
3838
struct cam_qcom_scm_pas_context *ctx,
3939
const struct firmware *fw,
4040
const char *firmware,
41-
void *mem_region,
4241
phys_addr_t *reloc_base);
4342

4443
typedef int (*qcom_scm_pas_prepare_and_auth_reset_t)(
@@ -614,7 +613,6 @@ static int __load_firmware(struct platform_device *pdev,
614613
const char *fw_name;
615614
const struct firmware *firmware = NULL;
616615
char firmware_name[ICP_FW_NAME_MAX_SIZE] = {0};
617-
void *vaddr = NULL;
618616
struct device_node *node;
619617
struct resource res;
620618
phys_addr_t res_start;
@@ -679,14 +677,6 @@ static int __load_firmware(struct platform_device *pdev,
679677
goto out;
680678
}
681679

682-
vaddr = ioremap_wc(res_start, res_size);
683-
if (!vaddr) {
684-
CAM_ERR(CAM_ICP, "unable to map firmware carveout");
685-
rc = -ENOMEM;
686-
goto out;
687-
}
688-
689-
690680
fn_devm_qcom_scm_pas_context_alloc = (devm_qcom_scm_pas_context_alloc_t)
691681
__symbol_get("devm_qcom_scm_pas_context_alloc");
692682

@@ -707,7 +697,6 @@ static int __load_firmware(struct platform_device *pdev,
707697

708698
cam_qcom_pas_ctx_set_use_tzmem(fw->ctx, fw->has_el2_iommu);
709699

710-
711700
fn_qcom_mdt_pas_load = (qcom_mdt_pas_load_t)__symbol_get("qcom_mdt_pas_load");
712701
if (!fn_qcom_mdt_pas_load) {
713702
CAM_ERR(CAM_ICP,
@@ -717,7 +706,7 @@ static int __load_firmware(struct platform_device *pdev,
717706
return -EOPNOTSUPP;
718707
}
719708

720-
rc = fn_qcom_mdt_pas_load(fw->ctx, firmware, firmware_name, vaddr, NULL);
709+
rc = fn_qcom_mdt_pas_load(fw->ctx, firmware, firmware_name, NULL);
721710
if (rc) {
722711
CAM_ERR(CAM_ICP, "failed to load firmware rc=%d", rc);
723712
fw->ctx = NULL;
@@ -729,9 +718,6 @@ static int __load_firmware(struct platform_device *pdev,
729718

730719
CAM_DBG(CAM_ICP, "res_start=0x%x, res_size=%zu", res_start, res_size);
731720
out:
732-
if (vaddr)
733-
iounmap(vaddr);
734-
735721
if (fn_devm_qcom_scm_pas_context_alloc)
736722
symbol_put_addr(fn_devm_qcom_scm_pas_context_alloc);
737723
if (fn_qcom_mdt_pas_load)

0 commit comments

Comments
 (0)