Merge "msm: camera: isp: Update Phy source for CPHY TPG" into camera-kernel.lnx.5.0

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -2779,13 +2779,6 @@ static int cam_ife_hw_mgr_acquire_csid_hw(
 
 	ife_hw_mgr = ife_ctx->hw_mgr;
 
-	if (ife_ctx->is_tpg) {
-		if (ife_ctx->res_list_tpg.hw_res[0]->hw_intf->hw_idx == 0)
-			csid_acquire->phy_sel = CAM_ISP_IFE_IN_RES_PHY_0;
-		else
-			csid_acquire->phy_sel = CAM_ISP_IFE_IN_RES_PHY_1;
-	}
-
 	if (ife_ctx->is_rdi_only_context)
 		csid_acquire->can_use_lite = true;
 

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

@@ -1460,13 +1460,13 @@ static int cam_ife_csid_hw_ver1_rx_cfg(
 		csid_hw->rx_cfg.phy_sel = 0;
 		break;
 	case CAM_ISP_IFE_IN_RES_CPHY_TPG_0:
-		csid_hw->rx_cfg.phy_sel = 1;
+		csid_hw->rx_cfg.phy_sel = 0;
 		break;
 	case CAM_ISP_IFE_IN_RES_CPHY_TPG_1:
-		csid_hw->rx_cfg.phy_sel = 2;
+		csid_hw->rx_cfg.phy_sel = 1;
 		break;
 	case CAM_ISP_IFE_IN_RES_CPHY_TPG_2:
-		csid_hw->rx_cfg.phy_sel = 3;
+		csid_hw->rx_cfg.phy_sel = 2;
 		break;
 	default:
 		csid_hw->rx_cfg.phy_sel =