mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 22:40:54 -04:00
Merge "msm: camera: common: Add support of PHY TPG deinitialization" into camera-kernel.lnx.4.0
This commit is contained in:
commit
1af3ec8d9d
3 changed files with 6 additions and 2 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
ifeq ($(CONFIG_QGKI),y)
|
||||
export CONFIG_SPECTRA_CAMERA=m
|
||||
$(info "SPECTRA_CAMERA IS STATIC")
|
||||
$(info "SPECTRA_CAMERA IS MODULAR")
|
||||
else
|
||||
$(info "SPECTRA_CAMERA IS MODULAR")
|
||||
export CONFIG_SPECTRA_CAMERA=m
|
||||
|
|
|
|||
|
|
@ -484,6 +484,9 @@ static void cam_ife_hw_mgr_deinit_hw(
|
|||
return;
|
||||
}
|
||||
|
||||
if (ctx->is_tpg)
|
||||
cam_ife_hw_mgr_deinit_hw_res(&ctx->res_list_tpg);
|
||||
|
||||
/* Deinit IFE CID */
|
||||
list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_cid, list) {
|
||||
CAM_DBG(CAM_ISP, "%s: Going to DeInit IFE CID\n", __func__);
|
||||
|
|
|
|||
|
|
@ -1884,7 +1884,8 @@ static int cam_ife_csid_init_config_pxl_path(
|
|||
*/
|
||||
if (!(csid_hw->csid_debug & CSID_DEBUG_DISABLE_EARLY_EOF) &&
|
||||
(camera_hw_version != CAM_CPAS_TITAN_480_V100) &&
|
||||
(camera_hw_version != CAM_CPAS_TITAN_580_V100)) {
|
||||
(camera_hw_version != CAM_CPAS_TITAN_580_V100) &&
|
||||
(camera_hw_version != CAM_CPAS_TITAN_570_V200)) {
|
||||
val = cam_io_r_mb(soc_info->reg_map[0].mem_base +
|
||||
pxl_reg->csid_pxl_cfg0_addr);
|
||||
val |= (1 << pxl_reg->early_eof_en_shift_val);
|
||||
|
|
|
|||
Loading…
Reference in a new issue