Merge "msm: camera: custom: Disable overflow recovery" into camera-kernel.lnx.3.1 (10ea3ffc) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/cam_cust/cam_custom_hw_mgr/cam_custom_csid/cam_custom_csid480.h

+4 −4

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_CUSTOM_CSID_480_H_
		@@ -56,7 +56,7 @@ static struct cam_ife_csid_udi_reg_offset
		.csid_udi_byte_cntr_pong_addr = 0x2e4,
		/* configurations */
		.ccif_violation_en = 1,
		.overflow_ctrl_en = 1,
		.overflow_ctrl_en = 0,
		};

		static struct cam_ife_csid_udi_reg_offset
		@@ -105,7 +105,7 @@ static struct cam_ife_csid_udi_reg_offset
		.csid_udi_byte_cntr_pong_addr = 0x3e4,
		/* configurations */
		.ccif_violation_en = 1,
		.overflow_ctrl_en = 1,
		.overflow_ctrl_en = 0,
		};

		static struct cam_ife_csid_udi_reg_offset
		@@ -155,7 +155,7 @@ static struct cam_ife_csid_udi_reg_offset
		.csid_udi_byte_cntr_pong_addr = 0x4e4,
		/* configurations */
		.ccif_violation_en = 1,
		.overflow_ctrl_en = 1,
		.overflow_ctrl_en = 0,
		};

		static struct cam_ife_csid_csi2_rx_reg_offset