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

Commit 6f34a2af authored by Evgeniy Borisov's avatar Evgeniy Borisov
Browse files

msm: camera: Populate sensor actuator subdev id during probe 



We can use this change in camera multimodule architecture.

Add support for more than one actuator source per generic
camera node. All sensors using that node search for
specific actuator sub device and update id.

Change-Id: I6e44062c66011ba94f4c784bdf40c0fb5df2edee
Signed-off-by: default avatarEvgeniy Borisov <eborisov@codeaurora.org>
parent 9779ad77

arch/arm/mach-msm/include/mach/camera2.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct msm_camera_power_ctrl_t { 
struct msm_camera_sensor_board_info {

	const char *sensor_name;

	const char *eeprom_name;

	const char *actuator_name;

	struct msm_camera_slave_info *slave_info;

	struct msm_camera_csi_lane_params *csi_lane_params;

	struct msm_camera_sensor_strobe_flash_data *strobe_flash_data;

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

+58 −1
Original line number Diff line number Diff line
@@ -213,6 +213,53 @@ static int32_t msm_sensor_fill_eeprom_subdevid_by_name( 
	return rc;

}



static int32_t msm_sensor_fill_actuator_subdevid_by_name(

				struct msm_sensor_ctrl_t *s_ctrl)

{

	int32_t rc = 0;

	struct device_node *src_node = NULL;

	uint32_t val = 0, actuator_name_len;

	int32_t *actuator_subdev_id;

	struct  msm_sensor_info_t *sensor_info;

	struct device_node *of_node = s_ctrl->of_node;



	if (!s_ctrl->sensordata->actuator_name || !of_node)

		return -EINVAL;



	actuator_name_len = strlen(s_ctrl->sensordata->actuator_name);

	if (actuator_name_len >= MAX_SENSOR_NAME)

		return -EINVAL;



	sensor_info = s_ctrl->sensordata->sensor_info;

	actuator_subdev_id = &sensor_info->subdev_id[SUB_MODULE_ACTUATOR];

	/*

	 * string for actuator name is valid, set sudev id to -1

	 * and try to found new id

	 */

	*actuator_subdev_id = -1;



	if (0 == actuator_name_len)

		return 0;



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

	if (!src_node) {

		CDBG("%s:%d src_node NULL\n", __func__, __LINE__);

	} else {

		rc = of_property_read_u32(src_node, "cell-index", &val);

		CDBG("%s qcom,actuator cell index %d, rc %d\n", __func__,

			val, rc);

		if (rc < 0) {

			pr_err("%s failed %d\n", __func__, __LINE__);

			return -EINVAL;

		}

		*actuator_subdev_id = val;

		of_node_put(src_node);

		src_node = NULL;

	}



	return rc;

}



/* static function definition */

int32_t msm_sensor_driver_probe(void *setting)

{
@@ -362,9 +409,11 @@ int32_t msm_sensor_driver_probe(void *setting) 
		goto FREE_POWER_SETTING;

	}



	/* Update sensor and eeprom name in sensor control structure */

	/* Update sensor, actuator and eeprom name in

	*  sensor control structure */

	s_ctrl->sensordata->sensor_name = slave_info->sensor_name;

	s_ctrl->sensordata->eeprom_name = slave_info->eeprom_name;

	s_ctrl->sensordata->actuator_name = slave_info->actuator_name;



	/*

	 * Update eeporm subdevice Id by input eeprom name
@@ -374,6 +423,14 @@ int32_t msm_sensor_driver_probe(void *setting) 
		pr_err("%s failed %d\n", __func__, __LINE__);

		goto FREE_POWER_SETTING;

	}

	/*

	 * Update actuator subdevice Id by input actuator name

	 */

	rc = msm_sensor_fill_actuator_subdevid_by_name(s_ctrl);

	if (rc < 0) {

		pr_err("%s failed %d\n", __func__, __LINE__);

		goto FREE_POWER_SETTING;

	}



	/* Power up and probe sensor */

	rc = s_ctrl->func_tbl->sensor_power_up(s_ctrl);

include/media/msm_cam_sensor.h

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ enum cci_i2c_master_t { 
struct msm_camera_sensor_slave_info {

	char sensor_name[32];

	char eeprom_name[32];

	char actuator_name[32];

	enum msm_sensor_camera_id_t camera_id;

	uint16_t slave_addr;

	enum msm_camera_i2c_reg_addr_type addr_type;