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

Commit 3d29f846 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: sensor: Add 8939 CSID hardware version"

parents 68378a40 d64be07d

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

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define CSID_VERSION_V31_1                    0x30010001

#define CSID_VERSION_V32                      0x30020000

#define CSID_VERSION_V33                      0x30030000

#define CSID_VERSION_V34                      0x30040000

#define CSID_VERSION_V40                      0x40000000

#define MSM_CSID_DRV_NAME                    "msm_csid"
@@ -388,7 +389,8 @@ static int msm_csid_release(struct csid_device *csid_dev) 
			NULL, 0, &csid_dev->csi_vdd, 0);

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

		(csid_dev->hw_version == CSID_VERSION_V32) ||

		(csid_dev->hw_version == CSID_VERSION_V33)) {

		(csid_dev->hw_version == CSID_VERSION_V33) ||

		(csid_dev->hw_version == CSID_VERSION_V34)) {

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

			csid_dev->csid_clk, csid_dev->num_clk, 0);

		msm_camera_enable_vreg(&csid_dev->pdev->dev,