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

Commit 39cf7099 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: csiphy: Add logic to program userspace settle count" into camera-kernel.lnx.4.0

parents 263c743a 55a25c18

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+48 −9
Original line number Diff line number Diff line
@@ -530,6 +530,11 @@ static int cam_csiphy_cphy_data_rate_config( 
	uint32_t lane_enable = 0;

	uint8_t lane_cnt = 0;

	uint16_t lane_assign = 0;

	uint64_t intermediate_var = 0;

	uint16_t settle_cnt = 0;

	uint32_t reg_addr = 0, reg_data = 0, reg_param_type = 0;

	uint8_t  skew_cal_enable = 0;

	int32_t  delay = 0;



	if ((csiphy_device == NULL) ||

		(csiphy_device->ctrl_reg == NULL) ||
@@ -548,6 +553,12 @@ static int cam_csiphy_cphy_data_rate_config( 
		settings_table->num_data_rate_settings;

	lane_cnt = csiphy_device->csiphy_info[idx].lane_cnt;



	intermediate_var = csiphy_device->csiphy_info[idx].settle_time;

	do_div(intermediate_var, 200000000);

	settle_cnt = intermediate_var;

	skew_cal_enable =

		csiphy_device->csiphy_info[idx].mipi_flags & SKEW_CAL_MASK;



	CAM_DBG(CAM_CSIPHY, "required data rate : %llu", phy_data_rate);

	for (data_rate_idx = 0; data_rate_idx < num_table_entries;

			data_rate_idx++) {
@@ -584,15 +595,43 @@ static int cam_csiphy_cphy_data_rate_config( 
			per_lane = &drate_settings[data_rate_idx].per_lane_info[lane_idx];



			for (i = 0; i < num_reg_entries; i++) {

				uint32_t reg_addr =

				per_lane->csiphy_data_rate_regs[i].reg_addr;



				uint32_t reg_data =

				per_lane->csiphy_data_rate_regs[i].reg_data;



				CAM_DBG(CAM_CSIPHY, "writing reg : %x val : %x",

					reg_addr, reg_data);

				cam_io_w_mb(reg_data, csiphybase + reg_addr);

				reg_addr = per_lane->csiphy_data_rate_regs[i]

					.reg_addr;

				reg_data = per_lane->csiphy_data_rate_regs[i]

					.reg_data;

				reg_param_type =

					per_lane->csiphy_data_rate_regs[i]

					.csiphy_param_type;

				delay = per_lane->csiphy_data_rate_regs[i]

					.delay;

				CAM_DBG(CAM_CSIPHY,

					"param_type: %d writing reg : %x val : %x delay: %dus",

					reg_param_type, reg_addr, reg_data,

					delay);

				switch (reg_param_type) {

				case CSIPHY_DEFAULT_PARAMS:

					cam_io_w_mb(reg_data,

						csiphybase + reg_addr);

				break;

				case CSIPHY_SETTLE_CNT_LOWER_BYTE:

					cam_io_w_mb(settle_cnt & 0xFF,

						csiphybase + reg_addr);

				break;

				case CSIPHY_SETTLE_CNT_HIGHER_BYTE:

					cam_io_w_mb((settle_cnt >> 8) & 0xFF,

						csiphybase + reg_addr);

				break;

				case CSIPHY_SKEW_CAL:

				if (skew_cal_enable)

					cam_io_w_mb(reg_data,

						csiphybase + reg_addr);

				break;

				default:

					CAM_DBG(CAM_CSIPHY, "Do Nothing");

				break;

				}

				if (delay > 0)

					usleep_range(delay, delay + 5);

			}

		}

		break;