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

Commit 60273c85 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: Update CSID driver for 8974 pro"

parents 30a42b52 e0ea5fed

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

+8 −48
Original line number Diff line number Diff line
@@ -285,7 +285,6 @@ static int msm_csid_release(struct csid_device *csid_dev) 


	disable_irq(csid_dev->irq->start);



	if (csid_dev->hw_version == CSID_VERSION_V20) {

	msm_cam_clk_enable(&csid_dev->pdev->dev, csid_clk_info,

		csid_dev->csid_clk, ARRAY_SIZE(csid_clk_info), 0);
@@ -296,45 +295,6 @@ static int msm_csid_release(struct csid_device *csid_dev) 
	msm_camera_config_vreg(&csid_dev->pdev->dev,

		csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

		NULL, 0, &csid_dev->csi_vdd, 0);

	} else if (csid_dev->hw_version == CSID_VERSION_V22) {

		msm_cam_clk_enable(&csid_dev->pdev->dev,

			csid_clk_info,

			csid_dev->csid_clk,

			ARRAY_SIZE(csid_clk_info), 0);



		msm_camera_enable_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);



		msm_camera_config_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);

	} else if ((csid_dev->hw_version >= CSID_VERSION_V30 &&

		csid_dev->hw_version < CSID_VERSION_V31) ||

		csid_dev->hw_version == CSID_VERSION_V40) {

		msm_cam_clk_enable(&csid_dev->pdev->dev, csid_clk_info,

			csid_dev->csid_clk, ARRAY_SIZE(csid_clk_info), 0);

		msm_camera_enable_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);

		msm_camera_config_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);

	} else if (csid_dev->hw_version == CSID_VERSION_V31) {

		msm_cam_clk_enable(&csid_dev->pdev->dev, csid_clk_info,

			csid_dev->csid_clk, ARRAY_SIZE(csid_clk_info), 0);

		msm_camera_enable_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);



		msm_camera_config_vreg(&csid_dev->pdev->dev,

			csid_vreg_info, ARRAY_SIZE(csid_vreg_info),

			NULL, 0, &csid_dev->csi_vdd, 0);

	} else {

		pr_err("%s:%d, invalid hw version : 0x%x", __func__, __LINE__,

		csid_dev->hw_version);

		return -EINVAL;

	}



	iounmap(csid_dev->base);

	csid_dev->base = NULL;