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

Commit 13906d93 authored by Terence Ho's avatar Terence Ho
Browse files

ais: Fix for csiphy register clock release 



Release the correct register clock for csiphy.
Also cleanup unnecessary logging.

Change-Id: I84bc6822bfb3e09291804f6f6d4031f45680cf2d
Signed-off-by: default avatarTerence Ho <terenceh@codeaurora.org>
parent e539a094

drivers/media/platform/msm/ais/isp/msm_isp_util.c

+0 −3
Original line number Diff line number Diff line
@@ -1029,19 +1029,16 @@ static long msm_isp_ioctl_unlocked(struct v4l2_subdev *sd, 
		mutex_unlock(&vfe_dev->core_mutex);

		break;

	case VIDIOC_MSM_ISP_OPERATION_CFG:

		pr_err("received VIDIOC_MSM_ISP_OPERATION_CFG\n");

		mutex_lock(&vfe_dev->core_mutex);

		msm_isp_operation_cfg(vfe_dev, arg);

		mutex_unlock(&vfe_dev->core_mutex);

		break;

	case VIDIOC_MSM_ISP_AXI_OUTPUT_CFG:

		pr_err("received VIDIOC_MSM_ISP_AXI_OUTPUT_CFG\n");

		mutex_lock(&vfe_dev->core_mutex);

		rc = msm_isp_axi_output_cfg(vfe_dev, arg);

		mutex_unlock(&vfe_dev->core_mutex);

		break;

	case VIDIOC_MSM_ISP_CAMIF_CFG:

		pr_err("received VFE_CMD_ID_CAMIF_CONFIG\n");

		mutex_lock(&vfe_dev->core_mutex);

		rc = msm_isp_camif_cfg(vfe_dev, arg);

		mutex_unlock(&vfe_dev->core_mutex);

drivers/media/platform/msm/ais/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static int msm_ispif_config(struct ispif_device *ispif, 
		intftype = params->entries[i].intftype;

		vfe_intf = params->entries[i].vfe_intf;



		pr_err("%s %d - intftype %x, vfe_intf %d, csid %d\n", __func__,

		CDBG("%s %d - intftype %x, vfe_intf %d, csid %d\n", __func__,

			i, intftype, vfe_intf, params->entries[i].csid);



		if ((intftype >= INTF_MAX) ||

drivers/media/platform/msm/ais/sensor/csid/msm_csid.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int msm_csid_cid_lut(struct csid_device *csid_dev) 
			csid_lut_params->vc_cfg_a[i].decode_format);

		if (csid_lut_params->vc_cfg_a[i].dt < 0x12 ||

			csid_lut_params->vc_cfg_a[i].dt > 0x37) {

			pr_err("%s: unsupported data type 0x%x\n",

			CDBG("%s: unsupported data type 0x%x\n",

				 __func__, csid_lut_params->vc_cfg_a[i].dt);

			continue;

		}

drivers/media/platform/msm/ais/sensor/csiphy/msm_csiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -1537,7 +1537,7 @@ static int msm_csiphy_exit(struct platform_device *pdev) 
		&csiphy_dev->csiphy_all_clk,

		csiphy_dev->num_all_clk);



	msm_camera_put_reg_base(pdev, csiphy_dev->base, "csid", true);

	msm_camera_put_reg_base(pdev, csiphy_dev->base, "csiphy", true);

	if (csiphy_dev->hw_dts_version >= CSIPHY_VERSION_V30) {

		msm_camera_put_reg_base(pdev, csiphy_dev->clk_mux_base,

			"csiphy_clk_mux", true);