From 1d2edff2b33050a9f7c0ec5338374d4b86d39309 Mon Sep 17 00:00:00 2001 From: George Shen Date: Mon, 11 May 2020 10:58:49 -0700 Subject: [PATCH] msm: cvp: Rename cvpss to evass CVP firmware renamed to "evass" (Engine for Visual Analytic Subsystem). Change-Id: I4d1ab032f8aa6a40581cffedbb3828525b0060b2 Signed-off-by: George Shen --- drivers/media/platform/msm/cvp/cvp_hfi.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_common.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_res_parse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/msm/cvp/cvp_hfi.c b/drivers/media/platform/msm/cvp/cvp_hfi.c index 8f8b90a7fa6b..9811516a990f 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi.c +++ b/drivers/media/platform/msm/cvp/cvp_hfi.c @@ -4268,7 +4268,7 @@ static int __load_fw(struct iris_hfi_device *device) || device->res->use_non_secure_pil) { if (!device->resources.fw.cookie) device->resources.fw.cookie = - subsystem_get_with_fwname("cvpss", + subsystem_get_with_fwname("evass", device->res->fw_name); if (IS_ERR_OR_NULL(device->resources.fw.cookie)) { diff --git a/drivers/media/platform/msm/cvp/msm_cvp_common.c b/drivers/media/platform/msm/cvp/msm_cvp_common.c index ea6cbb67e6b0..bd6950cbc69d 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_common.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_common.c @@ -627,7 +627,7 @@ static void handle_sys_error(enum hal_command_response cmd, void *data) unsigned long flags = 0; enum cvp_core_state cur_state; - subsystem_crashed("cvpss"); + subsystem_crashed("evass"); if (!response) { dprintk(CVP_ERR, "Failed to get valid response for sys error\n"); diff --git a/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c b/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c index 1259e3a6abe1..59fc1d3bfa26 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_res_parse.c @@ -701,7 +701,7 @@ int cvp_read_platform_resources_from_drv_data( res->sku_version = platform_data->sku_version; - res->fw_name = "cvpss"; + res->fw_name = "evass"; dprintk(CVP_CORE, "Firmware filename: %s\n", res->fw_name);