Merge "msm: camera: common: Add path for ubwc and linear" into camera-kernel.lnx.5.0

drivers/cam_cpas/cam_cpas_hw.h

@@ -19,7 +19,7 @@
 #define CAM_CPAS_MAX_TREE_LEVELS             4
 #define CAM_CPAS_MAX_RT_WR_NIU_NODES         10
 #define CAM_CPAS_MAX_GRAN_PATHS_PER_CLIENT   32
-#define CAM_CPAS_PATH_DATA_MAX               40
+#define CAM_CPAS_PATH_DATA_MAX               41
 #define CAM_CPAS_TRANSACTION_MAX             2
 #define CAM_CAMNOC_FILL_LVL_REG_INFO_MAX     6
 

dt-bindings/msm-camera.h

@@ -64,6 +64,8 @@
 #define CAM_CPAS_PATH_DATA_IFE_UBWC (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 6)
 #define CAM_CPAS_PATH_DATA_IFE_LINEAR_STATS \
 	(CAM_CPAS_PATH_DATA_CONSO_OFFSET + 7)
+#define CAM_CPAS_PATH_DATA_IFE_UBWC_LINEAR \
+	(CAM_CPAS_PATH_DATA_CONSO_OFFSET + 8)
 
 /* IPE Consolidated paths */
 #define CAM_CPAS_PATH_DATA_IPE_WR_VID_DISP (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 1)