Merge "msm: camera: isp: Update debug cfg for all paths" into camera-kernel.lnx.5.0

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe17x/cam_vfe680.h

@@ -498,7 +498,7 @@ static struct cam_vfe_top_ver4_reg_offset_common vfe680_top_common_reg = {
 	},
 };
 
-static struct cam_vfe_ver4_path_reg_data vfe_common_reg_data = {
+static struct cam_vfe_ver4_path_reg_data vfe_pp_common_reg_data = {
 	.sof_irq_mask                    = 0x00000001,
 	.epoch0_irq_mask                 = 0x10000,
 	.epoch1_irq_mask                 = 0x20000,
@@ -515,18 +515,21 @@ static struct cam_vfe_ver4_path_reg_data vfe680_vfe_full_rdi_reg_data[3] = {
 		.eof_irq_mask                    = 0x200,
 		.error_irq_mask                  = 0x0,
 		.enable_diagnostic_hw            = 0x1,
+		.top_debug_cfg_en                = 3,
 	},
 	{
 		.sof_irq_mask                    = 0x400,
 		.eof_irq_mask                    = 0x800,
 		.error_irq_mask                  = 0x0,
 		.enable_diagnostic_hw            = 0x1,
+		.top_debug_cfg_en                = 3,
 	},
 	{
 		.sof_irq_mask                    = 0x1000,
 		.eof_irq_mask                    = 0x2000,
 		.error_irq_mask                  = 0x0,
 		.enable_diagnostic_hw            = 0x1,
+		.top_debug_cfg_en                = 3,
 	},
 };
 
@@ -535,13 +538,15 @@ static struct cam_vfe_ver4_path_reg_data vfe680_pdlib_reg_data = {
 	.eof_irq_mask                    = 0x200,
 	.error_irq_mask                  = 0x0,
 	.enable_diagnostic_hw            = 0x1,
+	.top_debug_cfg_en                = 3,
 };
 
 static struct cam_vfe_ver4_path_reg_data vfe680_lcr_reg_data = {
 	.sof_irq_mask                    = 0x100,
 	.eof_irq_mask                    = 0x200,
-	.error_irq_mask                 = 0x10000000,
+	.error_irq_mask                  = 0x10000000,
 	.enable_diagnostic_hw            = 0x1,
+	.top_debug_cfg_en                = 3,
 };
 
 struct cam_vfe_ver4_path_hw_info
@@ -564,7 +569,7 @@ static struct cam_vfe_top_ver4_hw_info vfe680_top_hw_info = {
 	.common_reg = &vfe680_top_common_reg,
 	.vfe_full_hw_info = {
 		.common_reg     = &vfe680_top_common_reg,
-		.reg_data       = &vfe_common_reg_data,
+		.reg_data       = &vfe_pp_common_reg_data,
 	},
 	.pdlib_hw_info = {
 		.common_reg     = &vfe680_top_common_reg,

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_top_ver4.c

@@ -1593,15 +1593,6 @@ int cam_vfe_top_ver4_init(
 				&hw_info->pdlib_hw_info,
 				&top_priv->top_common.mux_rsrc[i],
 				vfe_irq_controller);
-		} else if (hw_info->mux_type[i] ==
-			CAM_VFE_IN_RD_VER_1_0) {
-			/* set the RD resource id */
-			top_priv->top_common.mux_rsrc[i].res_id =
-				CAM_ISP_HW_VFE_IN_RD;
-
-			rc = cam_vfe_fe_ver1_init(hw_intf, soc_info,
-				&hw_info->fe_hw_info,
-				&top_priv->top_common.mux_rsrc[i]);
 		} else if (hw_info->mux_type[i] ==
 			CAM_VFE_RDI_VER_1_0) {
 			/* set the RDI resource id */