A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-15 01:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Berlin:add ois data type

Browse source 
Fixed the issue that the submission milan ois bringup caused
the Berlin tele sensor not work

Change-Id: Ib77132b7ef9785f717bb95a51ba758ab7d761851
Signed-off-by: zhuql3 <zhuql3@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2074029
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: XiaoFeng Wang <wangxf32@lenovo.com>
Reviewed-by: Xingyun Fu <fuxy7@motorola.com>
Reviewed-by: Zilong Zhang <zhangzl7@lenovo.com>
Reviewed-by: Qiang Guo <guoq8@motorola.com>
Reviewed-by: Shanghui Zhang <zhangsh@motorola.com>
Reviewed-by: Long Cheng <chengl1@motorola.com>
Reviewed-by: Zhichao Chen <chenzc2@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
zhuql3 2021-09-23 13:34:40 +08:00 • committed by zhaoji1
commit 59915db63d
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/cam_sensor_module/cam_ois/cam_ois_core.c
View file

@ -339,6 +339,7 @@ static int cam_ois_slaveInfo_pkt_parser(struct cam_ois_ctrl_t *o_ctrl,
o_ctrl->ois_fw_txn_data_sz = ois_info->ois_fw_txn_data_sz;
o_ctrl->ois_fw_inc_addr = ois_info->ois_fw_inc_addr;
o_ctrl->ois_fw_addr_type = ois_info->ois_fw_addr_type;
o_ctrl->ois_fw_data_type = ois_info->ois_fw_data_type;
memcpy(o_ctrl->ois_name, ois_info->ois_name, OIS_NAME_LEN);
o_ctrl->ois_name[OIS_NAME_LEN - 1] = '\0';
o_ctrl->io_master_info.cci_client->retries = 3;
@ -396,7 +397,7 @@ static int cam_ois_fw_prog_download(struct cam_ois_ctrl_t *o_ctrl)
txn_data_size = o_ctrl->ois_fw_txn_data_sz;
i2c_reg_setting.addr_type = o_ctrl->ois_fw_addr_type;
i2c_reg_setting.data_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.data_type = o_ctrl->ois_fw_data_type;
i2c_reg_setting.delay = 0;
txn_regsetting_size = sizeof(struct cam_sensor_i2c_reg_array) * txn_data_size;
vaddr = vmalloc(txn_regsetting_size);
@ -476,7 +477,7 @@ static int cam_ois_fw_coeff_download(struct cam_ois_ctrl_t *o_ctrl)
txn_data_size = o_ctrl->ois_fw_txn_data_sz;
i2c_reg_setting.addr_type = o_ctrl->ois_fw_addr_type;
i2c_reg_setting.data_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.data_type = o_ctrl->ois_fw_data_type;
i2c_reg_setting.delay = 0;
txn_regsetting_size = sizeof(struct cam_sensor_i2c_reg_array) * txn_data_size;
vaddr = vmalloc(txn_regsetting_size);

1
drivers/cam_sensor_module/cam_ois/cam_ois_dev.h
View file

@ -141,6 +141,7 @@ struct cam_ois_ctrl_t {
uint8_t ois_fw_txn_data_sz;
uint8_t ois_fw_inc_addr;
uint8_t ois_fw_addr_type;
uint8_t ois_fw_data_type;
struct cam_ois_opcode opcode;
};

1
include/uapi/camera/media/cam_sensor.h
View file

@ -143,6 +143,7 @@ struct cam_cmd_ois_info {
__u8 ois_fw_txn_data_sz;
__u8 ois_fw_inc_addr;
__u8 ois_fw_addr_type;
__u8 ois_fw_data_type;
char ois_name[MAX_OIS_NAME_SIZE];
struct cam_ois_opcode opcode;
} __attribute__((packed));