lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

techpack: camera: ois: Update from star-r-oss

Browse Source 
Change-Id: I9dc3eca68ab3ba31d2ab84c7a22cd7c957edebba
This commit is contained in:
FlowerSea0208 2024-09-02 04:02:01 +08:00
parent 73b4b981d0
commit a8b1270931
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
techpack/camera/drivers/cam_sensor_module/cam_ois/cam_ois_core.c
View File

@ -369,7 +369,7 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
{
uint16_t total_bytes = 0;
uint8_t *ptr = NULL;
int32_t rc = 0, cnt, i;
int32_t rc = 0, cnt, i, j;
uint32_t fw_size;
const struct firmware *fw = NULL;
const char *fw_name_prog = NULL;
@ -404,7 +404,7 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
}
total_bytes = fw->size;
i2c_reg_setting.addr_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.addr_type = o_ctrl->opcode.fw_addr_type;
i2c_reg_setting.data_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.size = total_bytes;
i2c_reg_setting.delay = 0;
@ -420,17 +420,21 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
i2c_reg_setting.reg_setting = (struct cam_sensor_i2c_reg_array *) (
vaddr);
for (i = 0, ptr = (uint8_t *)fw->data; i < total_bytes;) {
for (i = 0, ptr = (uint8_t *)fw->data, j = 0; i < total_bytes;) {
for (cnt = 0; cnt < OIS_TRANS_SIZE && i < total_bytes;
cnt++, ptr++, i++) {
i2c_reg_setting.reg_setting[cnt].reg_addr =
o_ctrl->opcode.prog;
o_ctrl->opcode.prog + j * OIS_TRANS_SIZE;
i2c_reg_setting.reg_setting[cnt].reg_data = *ptr;
i2c_reg_setting.reg_setting[cnt].delay = 0;
i2c_reg_setting.reg_setting[cnt].data_mask = 0;
}
i2c_reg_setting.size = cnt;
if (o_ctrl->opcode.is_addr_increase) {
j++;
}
rc = camera_io_dev_write_continuous(&(o_ctrl->io_master_info),
&i2c_reg_setting, 1);
if (rc < 0) {
@ -451,7 +455,7 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
}
total_bytes = fw->size;
i2c_reg_setting.addr_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.addr_type = o_ctrl->opcode.fw_addr_type;
i2c_reg_setting.data_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.size = total_bytes;
i2c_reg_setting.delay = 0;
@ -467,17 +471,21 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
i2c_reg_setting.reg_setting = (struct cam_sensor_i2c_reg_array *) (
vaddr);
for (i = 0, ptr = (uint8_t *)fw->data; i < total_bytes;) {
for (i = 0, ptr = (uint8_t *)fw->data, j = 0; i < total_bytes;) {
for (cnt = 0; cnt < OIS_TRANS_SIZE && i < total_bytes;
cnt++, ptr++, i++) {
i2c_reg_setting.reg_setting[cnt].reg_addr =
o_ctrl->opcode.coeff;
o_ctrl->opcode.coeff + j * OIS_TRANS_SIZE;
i2c_reg_setting.reg_setting[cnt].reg_data = *ptr;
i2c_reg_setting.reg_setting[cnt].delay = 0;
i2c_reg_setting.reg_setting[cnt].data_mask = 0;
}
i2c_reg_setting.size = cnt;
if (o_ctrl->opcode.is_addr_increase) {
j++;
}
rc = camera_io_dev_write_continuous(&(o_ctrl->io_master_info),
&i2c_reg_setting, 1);
if (rc < 0) {
@ -494,12 +502,12 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
/* Load MEM, this step is not necessary for every ois, so skip load if not exist*/
rc = request_firmware(&fw, fw_name_mem, dev);
if (rc) {
CAM_ERR(CAM_OIS, "Skip to locate %s", fw_name_mem);
CAM_DBG(CAM_OIS, "Skip to locate %s", fw_name_mem);
return 0;
}
total_bytes = fw->size;
i2c_reg_setting.addr_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.addr_type = o_ctrl->opcode.fw_addr_type;
i2c_reg_setting.data_type = CAMERA_SENSOR_I2C_TYPE_BYTE;
i2c_reg_setting.size = total_bytes;
i2c_reg_setting.delay = 0;
@ -515,17 +523,21 @@ static int cam_default_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
i2c_reg_setting.reg_setting = (struct cam_sensor_i2c_reg_array *) (
vaddr);
for (i = 0, ptr = (uint8_t *)fw->data; i < total_bytes;) {
for (i = 0, ptr = (uint8_t *)fw->data, j = 0; i < total_bytes;) {
for (cnt = 0; cnt < OIS_TRANS_SIZE && i < total_bytes;
cnt++, ptr++, i++) {
i2c_reg_setting.reg_setting[cnt].reg_addr =
o_ctrl->opcode.memory;
o_ctrl->opcode.memory + j * OIS_TRANS_SIZE;
i2c_reg_setting.reg_setting[cnt].reg_data = *ptr;
i2c_reg_setting.reg_setting[cnt].delay = 0;
i2c_reg_setting.reg_setting[cnt].data_mask = 0;
}
i2c_reg_setting.size = cnt;
if (o_ctrl->opcode.is_addr_increase) {
j++;
}
rc = camera_io_dev_write_continuous(&(o_ctrl->io_master_info),
&i2c_reg_setting, 1);
if (rc < 0) {
@ -1404,6 +1416,9 @@ int cam_ois_driver_cmd(struct cam_ois_ctrl_t *o_ctrl, void *arg)
}
o_ctrl->cam_ois_state = CAM_OIS_CONFIG;
break;
case CAM_FLUSH_REQ:
// ignore the flush cmd
break;
default:
CAM_ERR(CAM_OIS, "invalid opcode");
goto release_mutex;

12
techpack/camera/include/uapi/camera/media/cam_sensor.h
View File

@ -108,10 +108,13 @@ struct cam_cmd_i2c_info {
/**
* struct cam_ois_opcode - Contains OIS opcode
*
* @prog : OIS FW prog register address
* @coeff : OIS FW coeff register address
* @pheripheral : OIS pheripheral
* @memory : OIS memory
* @prog : OIS FW prog register address
* @coeff : OIS FW coeff register address
* @pheripheral : OIS pheripheral
* @memory : OIS memory
* @fw_addr_type : OIS FW addr type
* @is_addr_increase : OIS FW addr increase
* others : OIS FW Upgrade related.
*/
struct cam_ois_opcode {
__u32 prog;
@ -119,6 +122,7 @@ struct cam_ois_opcode {
__u32 pheripheral;
__u32 memory;
__u8 fw_addr_type;
__u8 is_addr_increase;
__u8 is_addr_indata;
__u8 fwversion;
__u32 fwchecksumsize;