From 0b9105a22471bb9a4f4b03560ed39e477573a745 Mon Sep 17 00:00:00 2001 From: Rajesh Bondugula Date: Mon, 28 Mar 2016 14:50:48 -0700 Subject: msm: camera: sensor: Update actuator specific I2C structures Update actuator specific I2C addr_type and data_type structures. Use the strucutres defined by sensor. CRs-Fixed: 982082 Change-Id: I77753fd25d5a4256a4a4cdd74518facd63becf25 Signed-off-by: Rajesh Bondugula --- drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h | 2 +- include/media/msm_cam_sensor.h | 4 ++-- include/uapi/media/msm_cam_sensor.h | 4 ++-- include/uapi/media/msm_camsensor_sdk.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h index a8c3710186e3..3b61ee0acabb 100644 --- a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h +++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.h @@ -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; diff --git a/include/media/msm_cam_sensor.h b/include/media/msm_cam_sensor.h index 66c0e8f43883..fb650ab2693f 100644 --- a/include/media/msm_cam_sensor.h +++ b/include/media/msm_cam_sensor.h @@ -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; diff --git a/include/uapi/media/msm_cam_sensor.h b/include/uapi/media/msm_cam_sensor.h index c534911d864a..d83e00876fd5 100644 --- a/include/uapi/media/msm_cam_sensor.h +++ b/include/uapi/media/msm_cam_sensor.h @@ -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; diff --git a/include/uapi/media/msm_camsensor_sdk.h b/include/uapi/media/msm_camsensor_sdk.h index eab853bf137f..3985e9750af7 100644 --- a/include/uapi/media/msm_camsensor_sdk.h +++ b/include/uapi/media/msm_camsensor_sdk.h @@ -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; }; -- cgit v1.2.3