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-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add Build Flags for Data Width Change

Browse source 
Add build flags to cci_intf so that only kernel versions 4.19 and above
will have this functionality. This is because older kernel versions will
use a different cci_intf header and will not build.

Change-Id: I69111b4161734303e8a1c99223623896ac5d112b
Reviewed-on: https://gerrit.mot.com/1488924
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Rav(CR) Vembu <raviv@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
timwang 2020-01-27 15:51:26 -06:00 • committed by Tim Wang
commit 0dedfa732b
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/cci_intf.c
View file

@ -99,6 +99,7 @@ static int32_t cci_intf_xfer(
goto release;
}
addr = xfer->reg.addr;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)
for (i = 0; i < xfer->data.count; i += xfer->data.width) {
reg_conf_tbl[i].reg_addr = addr++;
if(xfer->data.width == 4) {
@ -117,13 +118,25 @@ static int32_t cci_intf_xfer(
}
reg_conf_tbl[i].delay = 0;
}
#else
for (i = 0; i < xfer->data.count; i += 1) {
reg_conf_tbl[i].reg_addr = addr++;
reg_conf_tbl[i].reg_data = xfer->data.buf[i];
reg_conf_tbl[i].delay = 0;
}
#endif
cci_ctrl.cmd = MSM_CCI_I2C_WRITE;
cci_ctrl.cfg.cci_i2c_write_cfg.reg_setting = reg_conf_tbl;
cci_ctrl.cfg.cci_i2c_write_cfg.addr_type =
(xfer->reg.width == 1 ?
CAMERA_SENSOR_I2C_TYPE_BYTE :
CAMERA_SENSOR_I2C_TYPE_WORD);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)
cci_ctrl.cfg.cci_i2c_write_cfg.data_type = xfer->data.width;
#else
cci_ctrl.cfg.cci_i2c_write_cfg.data_type =
CAMERA_SENSOR_I2C_TYPE_BYTE;
#endif
cci_ctrl.cfg.cci_i2c_write_cfg.size = xfer->data.count;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,19,0)
rc = v4l2_subdev_call(cam_cci_get_subdev(xfer->cci_device),