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

Commit 67a521b7 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: Config multiple interface for subdev"

parents a14aa92e f2c92c0f

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

+4 −1
Original line number Diff line number Diff line
@@ -115,8 +115,11 @@ int msm_sensor_get_sub_module_index(struct device_node *of_node, 
		pr_err("%s:%d failed\n", __func__, __LINE__);

		return -ENOMEM;

	}

	for (i = 0; i < SUB_MODULE_MAX; i++)

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

		sensor_info->subdev_id[i] = -1;

		/* Subdev expose additional interface for same sub module*/

		sensor_info->subdev_intf[i] = -1;

	}



	src_node = of_parse_phandle(of_node, "qcom,actuator-src", 0);

	if (!src_node) {

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+16 −4
Original line number Diff line number Diff line
@@ -620,9 +620,12 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =
@@ -635,9 +638,12 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
			cdata->cfg.sensor_info.sensor_name);

		CDBG("%s:%d session id %d\n", __func__, __LINE__,

			cdata->cfg.sensor_info.session_id);

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			CDBG("%s:%d subdev_id[%d] %d\n", __func__, __LINE__, i,

				cdata->cfg.sensor_info.subdev_id[i]);

			CDBG("%s:%d subdev_intf[%d] %d\n", __func__, __LINE__,

				i, cdata->cfg.sensor_info.subdev_intf[i]);

		}

		CDBG("%s:%d mount angle valid %d value %d\n", __func__,

			__LINE__, cdata->cfg.sensor_info.is_mount_angle_valid,

			cdata->cfg.sensor_info.sensor_mount_angle);
@@ -835,9 +841,12 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =
@@ -850,9 +859,12 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void __user *argp) 
			cdata->cfg.sensor_info.sensor_name);

		CDBG("%s:%d session id %d\n", __func__, __LINE__,

			cdata->cfg.sensor_info.session_id);

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			CDBG("%s:%d subdev_id[%d] %d\n", __func__, __LINE__, i,

				cdata->cfg.sensor_info.subdev_id[i]);

			CDBG("%s:%d subdev_intf[%d] %d\n", __func__, __LINE__,

				i, cdata->cfg.sensor_info.subdev_intf[i]);

		}

		CDBG("%s:%d mount angle valid %d value %d\n", __func__,

			__LINE__, cdata->cfg.sensor_info.is_mount_angle_valid,

			cdata->cfg.sensor_info.sensor_mount_angle);

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_driver.c

+4 −1
Original line number Diff line number Diff line
@@ -605,9 +605,12 @@ static void msm_sensor_fill_sensor_info(struct msm_sensor_ctrl_t *s_ctrl, 


	s_ctrl->sensordata->sensor_info->subdev_id[SUB_MODULE_SENSOR] =

		s_ctrl->sensordata->sensor_info->session_id;

	for (i = 0; i < SUB_MODULE_MAX; i++)

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

		sensor_info->subdev_id[i] =

			s_ctrl->sensordata->sensor_info->subdev_id[i];

		sensor_info->subdev_intf[i] =

			s_ctrl->sensordata->sensor_info->subdev_intf[i];

	}



	sensor_info->is_mount_angle_valid =

		s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

drivers/media/platform/msm/camera_v2/sensor/mt9m114.c

+8 −2
Original line number Diff line number Diff line
@@ -1188,9 +1188,12 @@ int32_t mt9m114_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =
@@ -1413,9 +1416,12 @@ int32_t mt9m114_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =

drivers/media/platform/msm/camera_v2/sensor/ov5645.c

+8 −2
Original line number Diff line number Diff line
@@ -589,9 +589,12 @@ int32_t ov5645_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =
@@ -855,9 +858,12 @@ int32_t ov5645_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
			sizeof(cdata->cfg.sensor_info.sensor_name));

		cdata->cfg.sensor_info.session_id =

			s_ctrl->sensordata->sensor_info->session_id;

		for (i = 0; i < SUB_MODULE_MAX; i++)

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

			cdata->cfg.sensor_info.subdev_id[i] =

				s_ctrl->sensordata->sensor_info->subdev_id[i];

			cdata->cfg.sensor_info.subdev_intf[i] =

				s_ctrl->sensordata->sensor_info->subdev_intf[i];

		}

		cdata->cfg.sensor_info.is_mount_angle_valid =

			s_ctrl->sensordata->sensor_info->is_mount_angle_valid;

		cdata->cfg.sensor_info.sensor_mount_angle =