joy/android_kernel_sony_sdm845
Watch
1
Fork
You've already forked android_kernel_sony_sdm845
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "ARM: msm: camera: Add multi-type support for i2c data" into dev/msm-4.9-camx

Browse source
This commit is contained in:
Jeyaprakash Soundrapandian 2017-11-13 17:30:04 -08:00 • committed by Gerrit - the friendly Code Review server
commit 88a33ae3c4
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cam_cci_core.c
View file

@ -730,17 +730,30 @@ static int32_t cam_cci_data_queue(struct cci_device *cci_dev,
reg_addr++;
} else {
if ((i + 1) <= cci_dev->payload_size) {
if (i2c_msg->data_type ==
CAMERA_SENSOR_I2C_TYPE_DWORD) {
switch (i2c_msg->data_type) {
case CAMERA_SENSOR_I2C_TYPE_DWORD:
data[i++] = (i2c_cmd->reg_data &
0xFF000000) >> 24;
/* fallthrough */
case CAMERA_SENSOR_I2C_TYPE_3B:
data[i++] = (i2c_cmd->reg_data &
0x00FF0000) >> 16;
/* fallthrough */
case CAMERA_SENSOR_I2C_TYPE_WORD:
data[i++] = (i2c_cmd->reg_data &
0x0000FF00) >> 8;
/* fallthrough */
case CAMERA_SENSOR_I2C_TYPE_BYTE:
data[i++] = i2c_cmd->reg_data &
0x000000FF;
break;
default:
CAM_ERR(CAM_CCI,
"invalid data type: %d",
i2c_msg->data_type);
return -EINVAL;
}
data[i++] = (i2c_cmd->reg_data &
0x0000FF00) >> 8; /* MSB */
data[i++] = i2c_cmd->reg_data &
0x000000FF; /* LSB */
if (c_ctrl->cmd ==
MSM_CCI_I2C_WRITE_SEQ)
reg_addr++;