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

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

Merge "msm: camera: sensor: Add slave address info" into dev/msm-4.9-camx

parents 25fc5107 f4cf3464

drivers/media/platform/msm/camera/cam_sensor_module/cam_sensor/cam_sensor_core.c

+12 −8
Original line number Diff line number Diff line
@@ -730,8 +730,9 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 


		s_ctrl->sensor_state = CAM_SENSOR_ACQUIRE;

		CAM_INFO(CAM_SENSOR,

			"CAM_ACQUIRE_DEV Success, sensor_id:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id);

			"CAM_ACQUIRE_DEV Success, sensor_id:0x%x,sensor_slave_addr:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id,

			s_ctrl->sensordata->slave_info.sensor_slave_addr);

	}

		break;

	case CAM_RELEASE_DEV: {
@@ -770,8 +771,9 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 


		s_ctrl->sensor_state = CAM_SENSOR_INIT;

		CAM_INFO(CAM_SENSOR,

			"CAM_RELEASE_DEV Success, sensor_id:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id);

			"CAM_RELEASE_DEV Success, sensor_id:0x%x,sensor_slave_addr:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id,

			s_ctrl->sensordata->slave_info.sensor_slave_addr);

		s_ctrl->streamon_count = 0;

		s_ctrl->streamoff_count = 0;

	}
@@ -810,8 +812,9 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
		}

		s_ctrl->sensor_state = CAM_SENSOR_START;

		CAM_INFO(CAM_SENSOR,

			"CAM_START_DEV Success, sensor_id:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id);

			"CAM_START_DEV Success, sensor_id:0x%x,sensor_slave_addr:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id,

			s_ctrl->sensordata->slave_info.sensor_slave_addr);

	}

		break;

	case CAM_STOP_DEV: {
@@ -836,8 +839,9 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
		cam_sensor_release_resource(s_ctrl);

		s_ctrl->sensor_state = CAM_SENSOR_ACQUIRE;

		CAM_INFO(CAM_SENSOR,

			"CAM_STOP_DEV Success, sensor_id:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id);

			"CAM_STOP_DEV Success, sensor_id:0x%x,sensor_slave_addr:0x%x",

			s_ctrl->sensordata->slave_info.sensor_id,

			s_ctrl->sensordata->slave_info.sensor_slave_addr);

	}

		break;

	case CAM_CONFIG_DEV: {