Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b08cf3d authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: icp: Reset pwr_ctrl register as part of PC" into dev/msm-4.14-camx

parents 169e32f2 b03d64a0

drivers/media/platform/msm/camera/cam_icp/icp_hw/bps_hw/bps_core.c

+4 −2
Original line number Diff line number Diff line
@@ -199,8 +199,10 @@ static int cam_bps_handle_resume(struct cam_hw_info *bps_dev) 
	cam_cpas_reg_read(core_info->cpas_handle,

		CAM_CPAS_REG_CPASTOP, hw_info->pwr_ctrl, true, &pwr_ctrl);

	if (pwr_ctrl & BPS_COLLAPSE_MASK) {

		CAM_ERR(CAM_ICP, "BPS: pwr_ctrl(%x)", pwr_ctrl);

		return -EINVAL;

		CAM_WARN(CAM_ICP, "BPS: pwr_ctrl set(%x)", pwr_ctrl);

		cam_cpas_reg_write(core_info->cpas_handle,

			CAM_CPAS_REG_CPASTOP,

			hw_info->pwr_ctrl, true, 0);

	}



	rc = cam_bps_transfer_gdsc_control(soc_info);

drivers/media/platform/msm/camera/cam_icp/icp_hw/ipe_hw/ipe_core.c

+5 −2
Original line number Diff line number Diff line
@@ -195,9 +195,12 @@ static int cam_ipe_handle_resume(struct cam_hw_info *ipe_dev) 
		CAM_CPAS_REG_CPASTOP, hw_info->pwr_ctrl,

		true, &pwr_ctrl);

	if (pwr_ctrl & IPE_COLLAPSE_MASK) {

		CAM_ERR(CAM_ICP, "IPE: resume failed : %d", pwr_ctrl);

		return -EINVAL;

		CAM_WARN(CAM_ICP, "IPE pwr_ctrl set(%x)", pwr_ctrl);

		cam_cpas_reg_write(core_info->cpas_handle,

			CAM_CPAS_REG_CPASTOP,

			hw_info->pwr_ctrl, true, 0);

	}



	rc = cam_ipe_transfer_gdsc_control(soc_info);

	cam_cpas_reg_read(core_info->cpas_handle,

		CAM_CPAS_REG_CPASTOP, hw_info->pwr_ctrl, true, &pwr_ctrl);