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

Commit bfe7e66c 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: sensor: Update actuator specific I2C structures"

parents 292da084 5343a4da

drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ struct msm_actuator_ctrl_t { 
	enum af_camera_name cam_name;

	struct mutex *actuator_mutex;

	struct msm_actuator_func_tbl *func_tbl;

	enum msm_actuator_data_type i2c_data_type;

	enum msm_camera_i2c_data_type i2c_data_type;

	struct v4l2_subdev sdev;

	struct v4l2_subdev_ops *act_v4l2_subdev_ops;

include/media/msm_cam_sensor.h

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ struct msm_actuator_params_t32 { 
	uint16_t init_setting_size;

	uint32_t i2c_addr;

	enum i2c_freq_mode_t i2c_freq_mode;

	enum msm_actuator_addr_type i2c_addr_type;

	enum msm_actuator_data_type i2c_data_type;

	enum msm_camera_i2c_reg_addr_type i2c_addr_type;

	enum msm_camera_i2c_data_type i2c_data_type;

	compat_uptr_t reg_tbl_params;

	compat_uptr_t init_settings;

	struct park_lens_data_t park_lens;

include/uapi/media/msm_cam_sensor.h

+2 −2
Original line number Diff line number Diff line
@@ -409,8 +409,8 @@ struct msm_actuator_params_t { 
	uint16_t init_setting_size;

	uint32_t i2c_addr;

	enum i2c_freq_mode_t i2c_freq_mode;

	enum msm_actuator_addr_type i2c_addr_type;

	enum msm_actuator_data_type i2c_data_type;

	enum msm_camera_i2c_reg_addr_type i2c_addr_type;

	enum msm_camera_i2c_data_type i2c_data_type;

	struct msm_actuator_reg_params_t *reg_tbl_params;

	struct reg_settings_t *init_settings;

	struct park_lens_data_t park_lens;

include/uapi/media/msm_camsensor_sdk.h

+2 −2
Original line number Diff line number Diff line
@@ -367,9 +367,9 @@ struct region_params_t { 


struct reg_settings_t {

	unsigned short reg_addr;

	enum msm_actuator_addr_type addr_type;

	enum msm_camera_i2c_reg_addr_type addr_type;

	unsigned short reg_data;

	enum msm_actuator_data_type data_type;

	enum msm_camera_i2c_data_type data_type;

	enum msm_actuator_i2c_operation i2c_operation;

	unsigned int delay;

};