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

Commit 9b7165c0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: csid: add csiphy4 and csiphy5 support"

parents 49ac5620 ea385cee

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid480.h

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static struct cam_ife_csid_csi2_rx_reg_offset 
	.csi2_capture_short_pkt_vc_shift              = 15,

	.csi2_capture_cphy_pkt_dt_shift               = 20,

	.csi2_capture_cphy_pkt_vc_shift               = 26,

	.csi2_rx_phy_num_mask                         = 0x3,

	.csi2_rx_phy_num_mask                         = 0x7,

};



static struct cam_ife_csid_csi2_tpg_reg_offset

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite480.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static struct cam_ife_csid_csi2_rx_reg_offset 
	.csi2_capture_short_pkt_vc_shift              = 15,

	.csi2_capture_cphy_pkt_dt_shift               = 20,

	.csi2_capture_cphy_pkt_vc_shift               = 26,

	.csi2_rx_phy_num_mask                         = 0x3,

	.csi2_rx_phy_num_mask                         = 0x7,

};



static struct cam_ife_csid_csi2_tpg_reg_offset

include/uapi/media/cam_isp_ife.h

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ 
#define CAM_ISP_IFE_IN_RES_PHY_1               (CAM_ISP_IFE_IN_RES_BASE + 2)

#define CAM_ISP_IFE_IN_RES_PHY_2               (CAM_ISP_IFE_IN_RES_BASE + 3)

#define CAM_ISP_IFE_IN_RES_PHY_3               (CAM_ISP_IFE_IN_RES_BASE + 4)

#define CAM_ISP_IFE_IN_RES_RD                  (CAM_ISP_IFE_IN_RES_BASE + 5)

#define CAM_ISP_IFE_IN_RES_MAX                 (CAM_ISP_IFE_IN_RES_BASE + 6)

#define CAM_ISP_IFE_IN_RES_PHY_4               (CAM_ISP_IFE_IN_RES_BASE + 5)

#define CAM_ISP_IFE_IN_RES_PHY_5               (CAM_ISP_IFE_IN_RES_BASE + 6)

#define CAM_ISP_IFE_IN_RES_RD                  (CAM_ISP_IFE_IN_RES_BASE + 7)

#define CAM_ISP_IFE_IN_RES_MAX                 (CAM_ISP_IFE_IN_RES_BASE + 8)



#endif /* __UAPI_CAM_ISP_IFE_H__ */

include/uapi/media/cam_isp_vfe.h

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

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

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

 */



#ifndef __UAPI_CAM_ISP_VFE_H__
@@ -43,7 +43,9 @@ 
#define CAM_ISP_VFE_IN_RES_PHY_1               (CAM_ISP_VFE_IN_RES_BASE + 2)

#define CAM_ISP_VFE_IN_RES_PHY_2               (CAM_ISP_VFE_IN_RES_BASE + 3)

#define CAM_ISP_VFE_IN_RES_PHY_3               (CAM_ISP_VFE_IN_RES_BASE + 4)

#define CAM_ISP_VFE_IN_RES_FE                  (CAM_ISP_VFE_IN_RES_BASE + 5)

#define CAM_ISP_VFE_IN_RES_MAX                 (CAM_ISP_VFE_IN_RES_BASE + 6)

#define CAM_ISP_VFE_IN_RES_PHY_4               (CAM_ISP_VFE_IN_RES_BASE + 5)

#define CAM_ISP_VFE_IN_RES_PHY_5               (CAM_ISP_VFE_IN_RES_BASE + 6)

#define CAM_ISP_VFE_IN_RES_FE                  (CAM_ISP_VFE_IN_RES_BASE + 7)

#define CAM_ISP_VFE_IN_RES_MAX                 (CAM_ISP_VFE_IN_RES_BASE + 8)



#endif /* __UAPI_CAM_ISP_VFE_H__ */