瀏覽代碼

msm: camera: icp: Fix non-secure fw load

Correct the reg-base check after icp dtsi reorganization.

CRs-Fixed: 3212166
Change-Id: Ia8c3ffcff60dcd84cd2420d5050a07c9fdf848dc
Signed-off-by: Suraj Dongre <[email protected]>
Suraj Dongre 3 年之前
父節點
當前提交
571fc20e57
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      drivers/cam_icp/icp_hw/icp_proc/icp_v2_hw/cam_icp_v2_core.c

+ 5 - 2
drivers/cam_icp/icp_hw/icp_proc/icp_v2_hw/cam_icp_v2_core.c

@@ -478,6 +478,7 @@ static int cam_icp_v2_non_sec_boot(
 	uint32_t arg_size)
 {
 	int rc;
+	struct cam_icp_soc_info *soc_priv;
 
 	if (!icp_v2_info || !args) {
 		CAM_ERR(CAM_ICP,
@@ -491,8 +492,10 @@ static int cam_icp_v2_non_sec_boot(
 		return -EINVAL;
 	}
 
-	if (icp_v2_info->soc_info.num_mem_block != ICP_V2_BASE_MAX) {
-		CAM_ERR(CAM_ICP, "check ICP SYS reg config in DT..");
+	soc_priv = (struct cam_icp_soc_info *)icp_v2_info->soc_info.soc_private;
+	if (icp_v2_info->soc_info.num_mem_block > ICP_V2_BASE_MAX) {
+		CAM_ERR(CAM_ICP, "check reg config in DT v 0x%x n %d",
+			soc_priv->hw_version, icp_v2_info->soc_info.num_mem_block);
 		return -EINVAL;
 	}