Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257ced3a authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Add format measure support for IFE lite" into camera-kernel.lnx.1.0

parents 285756a2 41755d5f

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite17x.h

+7 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_IFE_CSID_LITE17X_H_
@@ -298,6 +298,12 @@ static const struct cam_ife_csid_common_reg_offset 
	.ipp_irq_mask_all                             = 0x7FFF,

	.rdi_irq_mask_all                             = 0x7FFF,

	.ppp_irq_mask_all                             = 0xFFFF,

	.measure_en_hbi_vbi_cnt_mask                  = 0xC,

	.format_measure_en_val                        = 1,

	.format_measure_height_mask_val               = 0xFFFF,

	.format_measure_height_shift_val              = 0x10,

	.format_measure_width_mask_val                = 0xFFFF,

	.format_measure_width_shift_val               = 0x0,

};



static const struct cam_ife_csid_reg_offset cam_ife_csid_lite_17x_reg_offset = {

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite480.h

+5 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#ifndef _CAM_IFE_CSID_LITE_480_H_
@@ -321,6 +321,10 @@ static struct cam_ife_csid_common_reg_offset 
	.ppp_irq_mask_all                             = 0xFFFF,

	.measure_en_hbi_vbi_cnt_mask                  = 0xC,

	.format_measure_en_val                        = 1,

	.format_measure_height_mask_val               = 0xFFFF,

	.format_measure_height_shift_val              = 0x10,

	.format_measure_width_mask_val                = 0xFFFF,

	.format_measure_width_shift_val               = 0x0,

};



static struct cam_ife_csid_reg_offset cam_ife_csid_lite_480_reg_offset = {