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

Commit afd29190 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Reset the csiphy params in device release" into dev/msm-4.9-camx

parents b5e135c0 39d8c94c

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+7 −0
Original line number Diff line number Diff line
@@ -614,6 +614,13 @@ int32_t cam_csiphy_core_cfg(void *phy_dev, 


		if (csiphy_dev->acquire_count == 0)

			csiphy_dev->csiphy_state = CAM_CSIPHY_INIT;



		if (csiphy_dev->config_count == 0) {

			CAM_DBG(CAM_CSIPHY, "reset csiphy_info");

			csiphy_dev->csiphy_info.lane_mask = 0;

			csiphy_dev->csiphy_info.lane_cnt = 0;

			csiphy_dev->csiphy_info.combo_mode = 0;

		}

	}

		break;

	case CAM_CONFIG_DEV: {

drivers/media/platform/msm/camera/cam_sensor_module/cam_csiphy/include/cam_csiphy_1_0_hwreg.h

+5 −5
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct csiphy_reg_t 
		{0x0008, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x0010, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0038, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0060, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0060, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0064, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{
@@ -168,7 +168,7 @@ struct csiphy_reg_t 
		{0x070C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0710, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0738, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0760, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0760, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0764, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{
@@ -183,7 +183,7 @@ struct csiphy_reg_t 
		{0x0208, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x0210, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0238, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0260, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0260, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0264, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{
@@ -198,7 +198,7 @@ struct csiphy_reg_t 
		{0x0408, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE},

		{0x0410, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0438, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0460, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0460, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

	{
@@ -214,7 +214,7 @@ struct csiphy_reg_t 
		{0x060C, 0xA5, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0638, 0x1F, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0660, 0x01, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS},

		{0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS},

	},

};