diff --git a/drivers/cam_cpas/cam_cpas_hw.h b/drivers/cam_cpas/cam_cpas_hw.h
index 75c888c438..b3f89501b1 100644
--- a/drivers/cam_cpas/cam_cpas_hw.h
+++ b/drivers/cam_cpas/cam_cpas_hw.h
@@ -15,13 +15,13 @@
 #include "cam_soc_bus.h"
 
 #define CAM_CPAS_INFLIGHT_WORKS              5
-#define CAM_CPAS_MAX_CLIENTS                 42
+#define CAM_CPAS_MAX_CLIENTS                 43
 #define CAM_CPAS_MAX_AXI_PORTS               6
 #define CAM_CPAS_MAX_DRV_PORTS               4
 #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               41
+#define CAM_CPAS_PATH_DATA_MAX               42
 #define CAM_CPAS_TRANSACTION_MAX             2
 #define CAM_CAMNOC_FILL_LVL_REG_INFO_MAX     6
 #define CAM_CPAS_MAX_SLOPE_FACTOR            100
diff --git a/drivers/cam_cpas/cam_cpas_soc.h b/drivers/cam_cpas/cam_cpas_soc.h
index 31c21a30b6..93b0d8100e 100644
--- a/drivers/cam_cpas/cam_cpas_soc.h
+++ b/drivers/cam_cpas/cam_cpas_soc.h
@@ -12,7 +12,7 @@
 #include "cam_cpas_hw.h"
 
 #define CAM_REGULATOR_LEVEL_MAX 16
-#define CAM_CPAS_MAX_TREE_NODES 61
+#define CAM_CPAS_MAX_TREE_NODES 63
 #define CAM_CPAS_MAX_FUSE_FEATURE 10
 
 /**
diff --git a/dt-bindings/msm-camera.h b/dt-bindings/msm-camera.h
index 6579d6c63d..b0c65e4d5e 100644
--- a/dt-bindings/msm-camera.h
+++ b/dt-bindings/msm-camera.h
@@ -65,14 +65,12 @@
 #define CAM_CPAS_PATH_DATA_IFE_LINEAR_PDAF (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 1)
 #define CAM_CPAS_PATH_DATA_IFE_UBWC_STATS (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 2)
 #define CAM_CPAS_PATH_DATA_IFE_PIXEL_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 3)
-#define CAM_CPAS_PATH_DATA_IFE_RDI_PIXEL_RAW \
-	(CAM_CPAS_PATH_DATA_CONSO_OFFSET + 4)
+#define CAM_CPAS_PATH_DATA_IFE_RDI_PIXEL_RAW (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 4)
 #define CAM_CPAS_PATH_DATA_IFE_RDI_ALL (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 5)
 #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)
+#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)
+#define CAM_CPAS_PATH_DATA_IFE_PDAF_LINEAR (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 9)
 
 /* IPE Consolidated paths */
 #define CAM_CPAS_PATH_DATA_IPE_WR_VID_DISP (CAM_CPAS_PATH_DATA_CONSO_OFFSET + 1)