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

Commit 1e0847ba authored by Viswanadha Raju Thotakura's avatar Viswanadha Raju Thotakura Committed by Kyle Yan
Browse files

msm: camera: Changes to support MIPI C-Phy mode 



Changes to support MIPI Cphy mode on CSID version 5.0.

CRs-Fixed: 1030317
Change-Id: I6e0835811a47820714eddcf851ea15ece729c2bb
Signed-off-by: default avatarViswanadha Raju Thotakura <viswanad@codeaurora.org>
parent 3091a5c5

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

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int msm_csid_config(struct csid_device *csid_dev, 
			msm_camera_io_w(val, csidbase +

			csid_dev->ctrl_reg->csid_reg.csid_core_ctrl_1_addr);

		}

		if (csid_dev->hw_version == CSID_VERSION_V35 &&

		if (csid_dev->hw_version >= CSID_VERSION_V35 &&

			csid_params->csi_3p_sel == 1) {

			csid_dev->csid_3p_enabled = 1;

			val = (csid_params->lane_cnt - 1) << ENABLE_3P_BIT;

drivers/media/platform/msm/camera_v2/sensor/csiphy/include/msm_csiphy_5_0_hwreg.h

+4 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#define MSM_CSIPHY_5_0_HWREG_H



#define ULPM_WAKE_UP_TIMER_MODE                   2

#define GLITCH_ELIMINATE_NUM                      0x30

#define GLITCH_ELIMINATE_NUM                      0x32



#include <sensor/csiphy/msm_csiphy.h>
@@ -51,7 +51,7 @@ struct csiphy_reg_3ph_parms_t csiphy_v5_0_3ph = { 
	{0x148, 0xFE},

	{0x14C, 0x1},

	{0x154, 0x0},

	{0x15C, 0x3},

	{0x15C, 0x23},

	{0x160, ULPM_WAKE_UP_TIMER_MODE},

	{0x164, 0x00},

	{0x168, 0xA0},
@@ -92,12 +92,13 @@ struct csiphy_reg_3ph_parms_t csiphy_v5_0_3ph = { 
	{0x0, 0x0},

	{0x700, 0xC0},

	{0x150, 0},

	{0x1dc, 0x1},

	{0x1dc, 0x51},

	{0x2C, 0x1},

	{0x34, 0xf},

	{0x728, 0x4},

	{0x0, 0x91},

	{0x70C, 0x16},

	{0x38, 0xFE},

	{0x81c, 0x6},

};

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -309,9 +309,9 @@ static int msm_csiphy_3phase_lane_config_v50( 
		csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg.

		mipi_csiphy_3ph_cmn_ctrl6.addr);

	msm_camera_io_w(csiphy_dev->ctrl_reg->csiphy_3ph_reg.

		mipi_csiphy_3ph_cmn_ctrl7.data,

		mipi_csiphy_3ph_cmn_ctrl7_cphy.data,

		csiphybase + csiphy_dev->ctrl_reg->csiphy_3ph_reg.

		mipi_csiphy_3ph_cmn_ctrl7.addr);

		mipi_csiphy_3ph_cmn_ctrl7_cphy.addr);



	lane_mask = csiphy_params->lane_mask & 0x7;

	i = 0;

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct csiphy_reg_3ph_parms_t { 
	struct csiphy_reg_t mipi_csiphy_2ph_lnn_ctrl0;

	struct csiphy_reg_t mipi_csiphy_2ph_lnck_ctrl3;

	struct csiphy_reg_t mipi_csiphy_2ph_lnn_ctrl14;

	struct csiphy_reg_t mipi_csiphy_3ph_cmn_ctrl7_cphy;

};



struct csiphy_ctrl_t {