From 7264d367c385773100f49bf8bc8151fda1749541 Mon Sep 17 00:00:00 2001 From: Trishansh Bhardwaj Date: Sun, 16 Aug 2020 11:59:12 +0530 Subject: [PATCH] msm: camera: tfe: Adds support PHY3 input source Adds support for CSID input source PHY3. CRs-Fixed: 2756383 Change-Id: I988ffc353518b5d932fa95eedeef8607726e183f Signed-off-by: Trishansh Bhardwaj --- .../cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h | 2 +- include/uapi/camera/media/cam_isp_tfe.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h index 4d267bb086..94267ca0d1 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid530.h @@ -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, }; diff --git a/include/uapi/camera/media/cam_isp_tfe.h b/include/uapi/camera/media/cam_isp_tfe.h index fc71631136..3db5fbf623 100644 --- a/include/uapi/camera/media/cam_isp_tfe.h +++ b/include/uapi/camera/media/cam_isp_tfe.h @@ -1,6 +1,6 @@ /* 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__ */