Merge "msm: camera: isp: Add horizontal binning with qcfa binning" into camera-kernel.lnx.4.0

This commit is contained in:
Camera Software Integration 2021-03-18 11:04:42 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3649ffdcd5
2 changed files with 5 additions and 2 deletions

View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
*/
#ifndef _CAM_IFE_CSID_175_200_H_
@ -47,6 +47,7 @@ static struct cam_ife_csid_pxl_reg_offset
/* configurations */
.pix_store_en_shift_val = 7,
.early_eof_en_shift_val = 29,
.horizontal_bin_en_shift_val = 2,
.quad_cfa_bin_en_shift_val = 30,
.ccif_violation_en = 1,
};

View file

@ -2055,8 +2055,10 @@ static int cam_ife_csid_init_config_pxl_path(
}
if (is_ipp && csid_hw->binning_supported &&
csid_hw->binning_enable)
csid_hw->binning_enable) {
val |= (1 << pxl_reg->quad_cfa_bin_en_shift_val);
val |= (1 << pxl_reg->horizontal_bin_en_shift_val);
}
val |= (1 << pxl_reg->pix_store_en_shift_val);
cam_io_w_mb(val, soc_info->reg_map[0].mem_base +