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

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

Merge "msm: camera: tfe: Adds support PHY3 input source" into camera-kernel.lnx.4.0

parents 8ff7db91 7264d367

drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static struct cam_tfe_csid_csi2_rx_reg_offset 
	.csi2_capture_short_pkt_vc_shift              = 12,

	.csi2_capture_cphy_pkt_dt_shift               = 14,

	.csi2_capture_cphy_pkt_vc_shift               = 20,

	.csi2_rx_phy_num_mask                         = 0x3,

	.csi2_rx_phy_num_mask                         = 0x7,

	.csi2_rx_long_pkt_hdr_rst_stb_shift           = 0x1,

	.csi2_rx_short_pkt_hdr_rst_stb_shift          = 0x2,

};

include/uapi/camera/media/cam_isp_tfe.h

+3 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */

/*

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

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

 */



#ifndef __UAPI_CAM_ISP_TFE_H__
@@ -30,6 +30,7 @@ 
#define CAM_ISP_TFE_IN_RES_PHY_0               (CAM_ISP_TFE_IN_RES_BASE + 1)

#define CAM_ISP_TFE_IN_RES_PHY_1               (CAM_ISP_TFE_IN_RES_BASE + 2)

#define CAM_ISP_TFE_IN_RES_PHY_2               (CAM_ISP_TFE_IN_RES_BASE + 3)

#define CAM_ISP_TFE_IN_RES_MAX                 (CAM_ISP_TFE_IN_RES_BASE + 4)

#define CAM_ISP_TFE_IN_RES_PHY_3               (CAM_ISP_TFE_IN_RES_BASE + 4)

#define CAM_ISP_TFE_IN_RES_MAX                 (CAM_ISP_TFE_IN_RES_BASE + 5)



#endif /* __UAPI_CAM_ISP_TFE_H__ */