Merge "msm: camera: csid: Rename TPG vd/dt macros" into camera-kernel.lnx.4.0

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

@@ -26,8 +26,8 @@
 #define CAM_IFE_CSID_TPG_DT_VAL                        0x2B
 
 /* CSIPHY TPG VC/DT values */
-#define CAM_IFE_CSI_TPG_VC_VAL                         0x0
-#define CAM_IFE_CSI_TPG_DT_VAL                         0x2B
+#define CAM_IFE_CPHY_TPG_VC_VAL                         0x0
+#define CAM_IFE_CPHY_TPG_DT_VAL                         0x2B
 
 /* Timeout values in usec */
 #define CAM_IFE_CSID_TIMEOUT_SLEEP_US                  1000
@@ -1142,10 +1142,12 @@ int cam_ife_csid_path_reserve(struct cam_ife_csid_hw *csid_hw,
 		path_data->crop_enable);
 
 	if ((reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_0) ||
-		(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_1) ||
-		(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_TPG)) {
-		path_data->dt = CAM_IFE_CSI_TPG_DT_VAL;
-		path_data->vc = CAM_IFE_CSI_TPG_VC_VAL;
+		(reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_CPHY_TPG_1)) {
+		path_data->dt = CAM_IFE_CPHY_TPG_DT_VAL;
+		path_data->vc = CAM_IFE_CPHY_TPG_VC_VAL;
+	} else if (reserve->in_port->res_type == CAM_ISP_IFE_IN_RES_TPG) {
+		path_data->dt = CAM_IFE_CSID_TPG_DT_VAL;
+		path_data->vc = CAM_IFE_CSID_TPG_VC_VAL;
 	} else {
 		path_data->dt = reserve->in_port->dt[0];
 		path_data->vc = reserve->in_port->vc[0];