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

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

Merge "msm: camera: sensor: Use soc_info.index to replace subdev_id/id" into dev/msm-4.9-camx

parents aa08d826 0fe56181

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_core.c

+3 −1
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ int32_t cam_actuator_slaveInfo_pkt_parser(struct cam_actuator_ctrl_t *a_ctrl, 


	i2c_info = (struct cam_cmd_i2c_info *)cmd_buf;

	if (a_ctrl->io_master_info.master_type == CCI_MASTER) {

		a_ctrl->io_master_info.cci_client->cci_i2c_master =

			a_ctrl->cci_i2c_master;

		a_ctrl->io_master_info.cci_client->i2c_freq_mode =

			i2c_info->i2c_freq_mode;

		a_ctrl->io_master_info.cci_client->sid =
@@ -554,7 +556,7 @@ int32_t cam_actuator_driver_cmd(struct cam_actuator_ctrl_t *a_ctrl, 
	case CAM_QUERY_CAP: {

		struct cam_actuator_query_cap actuator_cap = {0};



		actuator_cap.slot_info = a_ctrl->id;

		actuator_cap.slot_info = a_ctrl->soc_info.index;

		if (copy_to_user((void __user *) cmd->handle, &actuator_cap,

			sizeof(struct cam_actuator_query_cap))) {

			CAM_ERR(CAM_ACTUATOR, "Failed Copy to User");

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_dev.c

+1 −2
Original line number Diff line number Diff line
@@ -286,8 +286,7 @@ static int32_t cam_actuator_driver_platform_probe( 
	}



	/* Fill platform device id*/

	a_ctrl->id = a_ctrl->soc_info.index;

	pdev->id = a_ctrl->id;

	pdev->id = a_ctrl->soc_info.index;



	rc = cam_actuator_init_subdev(a_ctrl);

	if (rc)

drivers/media/platform/msm/camera/cam_sensor_module/cam_actuator/cam_actuator_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ struct intf_params { 
 * @cci_i2c_master: I2C structure

 * @io_master_info: Information about the communication master

 * @actuator_mutex: Actuator mutex

 * @id: Cell Index

 * @act_apply_state: Actuator settings aRegulator config

 * @gconf: GPIO config

 * @pinctrl_info: Pinctrl information
@@ -91,7 +90,6 @@ struct cam_actuator_ctrl_t { 
	struct camera_io_master io_master_info;

	struct cam_hw_soc_info soc_info;

	struct mutex actuator_mutex;

	uint32_t id;

	enum msm_actuator_state_t act_apply_state;

	struct msm_camera_gpio_num_info *gpio_num_info;

	uint8_t cam_pinctrl_status;

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ int32_t cam_eeprom_driver_cmd(struct cam_eeprom_ctrl_t *e_ctrl, void *arg) 
	mutex_lock(&(e_ctrl->eeprom_mutex));

	switch (cmd->op_code) {

	case CAM_QUERY_CAP:

		eeprom_cap.slot_info = e_ctrl->subdev_id;

		eeprom_cap.slot_info = e_ctrl->soc_info.index;

		if (e_ctrl->userspace_probe == false)

			eeprom_cap.eeprom_kernel_probe = true;

		else

drivers/media/platform/msm/camera/cam_sensor_module/cam_eeprom/cam_eeprom_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ struct cam_eeprom_intf_params { 
 * @cci_i2c_master  :   I2C structure

 * @v4l2_dev_str    :   V4L2 device structure

 * @bridge_intf     :   bridge interface params

 * @subdev_id       :   subdev id

 * @userspace_probe :   flag indicates userspace or kernel probe

 * @cal_data        :   Calibration data

 * @device_name     :   Device name
@@ -171,7 +170,6 @@ struct cam_eeprom_ctrl_t { 
	struct cam_subdev v4l2_dev_str;

	struct cam_eeprom_intf_params bridge_intf;

	enum msm_camera_device_type_t eeprom_device_type;

	uint32_t subdev_id;

	bool userspace_probe;

	struct cam_eeprom_memory_block_t cal_data;

	char device_name[20];