Merge "msm: camera: cpas: Add version map entry for 680 titan version" into camera-kernel.lnx.4.0 (74553e55) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/cam_cpas/cpas_top/cam_cpastop_hw.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,15 @@ static const uint32_t cam_cpas_hw_version_map
		0,
		CAM_CPAS_TITAN_570_V200,
		},
		/* for camera_680 */
		{
		CAM_CPAS_TITAN_680_V100,
		0,
		0,
		0,
		0,
		0,
		},
		/* for camera_165 */
		{
		CAM_CPAS_TITAN_165_V100,

+21 −26

Original line number	Diff line number	Diff line
		@@ -58,11 +58,11 @@ static int cam_vfe_get_dt_properties(struct cam_hw_soc_info *soc_info)
		goto pid;
		}

		switch (soc_info->hw_version) {
		case CAM_CPAS_TITAN_480_V100:
		case CAM_CPAS_TITAN_580_V100:
		case CAM_CPAS_TITAN_570_V200:
		case CAM_CPAS_TITAN_165_V100:
		if (!of_property_read_bool(of_node, "ubwc-static-cfg")) {
		CAM_DBG(CAM_ISP, "ubwc-static-cfg not supported");
		goto pid;
		}

		num_ubwc_cfg = of_property_count_u32_elems(of_node,
		"ubwc-static-cfg");

		@@ -80,13 +80,8 @@ static int cam_vfe_get_dt_properties(struct cam_hw_soc_info *soc_info)
		if (rc < 0) {
		CAM_ERR(CAM_ISP,
		"unable to read ubwc static config");
		break;
		}
		}
		break;
		default:
		break;
		}
		pid:
		/* set some default values */
		vfe_soc_private->num_pid = 0;