samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: common: Detach pinctrl state operation

Browse Source 
Currently pinctrl state update operation is integrated
with platform resource operation. This can create unwanted
transition of pinctrl which can stay in suspend state.
This change detach and separate out the pinctrl entries
with index passed from devicetree. Pinctrl select
state operation is detach from platform enable/disable
operation to operate from device directly only for better
control with respect to operation.

CRs-Fixed: 2907475, 2954556
Change-Id: I918568f96e8888df6882f165458f5c4ab32d6348
Signed-off-by: Jigarkumar Zala <jzala@codeaurora.org>
This commit is contained in:
Jigarkumar Zala
2021-03-22 20:53:12 -07:00
parent 849491a0f2
commit 78f6e5bd2d
3 changed files with 198 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/cam_sensor_module/cam_cci/cam_cci_soc.c
View File

@@ -28,6 +28,14 @@ static int cam_cci_init_master(struct cci_device *cci_dev,
cci_dev->master_active_slave[master]++;
if (!cci_dev->cci_master_info[master].is_initilized) {
/* Re-initialize the completion */
rc = cam_soc_util_select_pinctrl_state(soc_info, master, true);
if (rc) {
CAM_ERR(CAM_CCI,
"Pinctrl active state x'sition failed, rc: %d",
rc);
goto MASTER_INIT_ERR;
}
reinit_completion(
&cci_dev->cci_master_info[master].reset_complete);
reinit_completion(&cci_dev->cci_master_info[master].rd_done);
@@ -56,8 +64,7 @@ static int cam_cci_init_master(struct cci_device *cci_dev,
"Failed: reset complete timeout for master: %d",
master);
rc = -ETIMEDOUT;
cci_dev->master_active_slave[master]--;
return rc;
goto MASTER_INIT_ERR;
}
flush_workqueue(cci_dev->write_wq[master]);
@@ -79,6 +86,11 @@ static int cam_cci_init_master(struct cci_device *cci_dev,
}
return 0;
MASTER_INIT_ERR:
cci_dev->master_active_slave[master]--;
return rc;
}
int cam_cci_init(struct v4l2_subdev *sd,
@@ -197,7 +209,7 @@ int cam_cci_init(struct v4l2_subdev *sd,
return 0;
reset_complete_failed:
cam_soc_util_disable_platform_resource(soc_info, 1, 1);
cam_soc_util_disable_platform_resource(soc_info, true, true);
platform_enable_failed:
cci_dev->ref_count--;
cam_cpas_stop(cci_dev->cpas_handle);
@@ -411,6 +423,10 @@ int cam_cci_soc_release(struct cci_device *cci_dev,
}
if (!(--cci_dev->master_active_slave[master])) {
if (cam_soc_util_select_pinctrl_state(soc_info, master, false))
CAM_WARN(CAM_CCI,
"Pinctrl suspend state x'sition failed");
cci_dev->cci_master_info[master].is_initilized = false;
CAM_DBG(CAM_CCI,
"All submodules are released for master: %d", master);