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

Commit d48eef6e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Vote bandwidth with clock enabled"

parents ac145e91 d618fc8a

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+17 −15
Original line number Diff line number Diff line
@@ -279,13 +279,6 @@ int msm_vfe47_init_hardware(struct vfe_device *vfe_dev) 
	else

		id = CAM_AHB_CLIENT_VFE1;



	rc = cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SVS_VOTE);

	if (rc < 0) {

		pr_err("%s: failed to vote for AHB\n", __func__);

		goto ahb_vote_fail;

	}

	vfe_dev->ahb_vote = CAM_AHB_SVS_VOTE;



	rc = vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(

								vfe_dev, 1);

	if (rc)
@@ -296,6 +289,13 @@ int msm_vfe47_init_hardware(struct vfe_device *vfe_dev) 
	if (rc)

		goto clk_enable_failed;



	rc = cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SVS_VOTE);

	if (rc < 0) {

		pr_err("%s: failed to vote for AHB\n", __func__);

		goto ahb_vote_fail;

	}

	vfe_dev->ahb_vote = CAM_AHB_SVS_VOTE;



	vfe_dev->common_data->dual_vfe_res->vfe_base[vfe_dev->pdev->id] =

		vfe_dev->vfe_base;
@@ -306,14 +306,14 @@ int msm_vfe47_init_hardware(struct vfe_device *vfe_dev) 
	return rc;

irq_enable_fail:

	vfe_dev->common_data->dual_vfe_res->vfe_base[vfe_dev->pdev->id] = NULL;

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_clks(vfe_dev, 0);

clk_enable_failed:

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(vfe_dev, 0);

enable_regulators_failed:

	if (cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SUSPEND_VOTE) < 0)

		pr_err("%s: failed to remove vote for AHB\n", __func__);

	vfe_dev->ahb_vote = CAM_AHB_SUSPEND_VOTE;

ahb_vote_fail:

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_clks(vfe_dev, 0);

clk_enable_failed:

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(vfe_dev, 0);

enable_regulators_failed:

	return rc;

}
@@ -332,9 +332,6 @@ void msm_vfe47_release_hardware(struct vfe_device *vfe_dev) 
	msm_isp_flush_tasklet(vfe_dev);



	vfe_dev->common_data->dual_vfe_res->vfe_base[vfe_dev->pdev->id] = NULL;

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_clks(

							vfe_dev, 0);

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(vfe_dev, 0);



	msm_isp_update_bandwidth(ISP_VFE0 + vfe_dev->pdev->id, 0, 0);
@@ -345,7 +342,12 @@ void msm_vfe47_release_hardware(struct vfe_device *vfe_dev) 


	if (cam_config_ahb_clk(NULL, 0, id, CAM_AHB_SUSPEND_VOTE) < 0)

		pr_err("%s: failed to vote for AHB\n", __func__);



	vfe_dev->ahb_vote = CAM_AHB_SUSPEND_VOTE;



	vfe_dev->hw_info->vfe_ops.platform_ops.enable_clks(

							vfe_dev, 0);

	vfe_dev->hw_info->vfe_ops.platform_ops.enable_regulators(vfe_dev, 0);

}



void msm_vfe47_init_hardware_reg(struct vfe_device *vfe_dev)