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-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: cci: Add CCI Global reset during CCI HW init" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Camera Software Integration 2020-09-30 14:04:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6f7608c0a2
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/cam_sensor_module/cam_cci/cam_cci_soc.c
View file

@ -39,9 +39,16 @@ static int cam_cci_init_master(struct cci_device *cci_dev,
/* Set reset pending flag to true */
cci_dev->cci_master_info[master].reset_pending = true;
cam_io_w_mb((master == MASTER_0) ?
CCI_M0_RESET_RMSK : CCI_M1_RESET_RMSK,
base + CCI_RESET_CMD_ADDR);
cci_dev->cci_master_info[master].status = 0;
if (cci_dev->ref_count == 1) {
cam_io_w_mb(CCI_RESET_CMD_RMSK,
base + CCI_RESET_CMD_ADDR);
cam_io_w_mb(0x1, base + CCI_RESET_CMD_ADDR);
} else {
cam_io_w_mb((master == MASTER_0) ?
CCI_M0_RESET_RMSK : CCI_M1_RESET_RMSK,
base + CCI_RESET_CMD_ADDR);
}
if (!wait_for_completion_timeout(
&cci_dev->cci_master_info[master].reset_complete,
CCI_TIMEOUT)) {