diff --git a/cape-camera.dtsi b/cape-camera.dtsi
index bdd5661c..a0f41cf8 100644
--- a/cape-camera.dtsi
+++ b/cape-camera.dtsi
@@ -2493,10 +2493,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,lx7",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-lx7 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -2505,15 +2505,16 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_lx7: qcom,lx7 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-lx7";
+		compatible = "qcom,cam-icp_v2";
+		icp-version = <0x0200>;
 		reg = <0xac01000 0x400>,
 			<0xac01800 0x400>,
 			<0x0ac04000 0x1000>;
-		reg-names = "lx7_csr", "lx7_cirq", "lx7_wd0";
+		reg-names = "icp_csr", "icp_cirq", "icp_wd0";
 		reg-cam-base = <0x1000 0x1800 0x4000>;
-		interrupt-names = "lx7";
+		interrupt-names = "icp";
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdsc";
 		gdsc-supply = <&cam_cc_titan_top_gdsc>;
diff --git a/diwali-camera.dtsi b/diwali-camera.dtsi
index 84be638f..dfe163c6 100644
--- a/diwali-camera.dtsi
+++ b/diwali-camera.dtsi
@@ -1551,10 +1551,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -1562,16 +1562,17 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_a5: qcom,a5 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;
 		clock-names =
diff --git a/kalama-camera.dtsi b/kalama-camera.dtsi
index 2302356b..7c4d84a6 100644
--- a/kalama-camera.dtsi
+++ b/kalama-camera.dtsi
@@ -2850,10 +2850,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,lx7",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-lx7 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -2862,15 +2862,16 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_lx7: qcom,lx7 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-lx7";
+		compatible = "qcom,cam-icp_v2";
+		icp-version = <0x0200>;
 		reg = <0xac01000 0x400>,
 			<0xac01800 0x400>,
 			<0x0ac04000 0x1000>;
-		reg-names = "lx7_csr", "lx7_cirq", "lx7_wd0";
+		reg-names = "icp_csr", "icp_cirq", "icp_wd0";
 		reg-cam-base = <0x1000 0x1800 0x4000>;
-		interrupt-names = "lx7";
+		interrupt-names = "icp";
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdsc";
 		gdsc-supply = <&cam_cc_titan_top_gdsc>;
diff --git a/kona-camera.dtsi b/kona-camera.dtsi
index e69dc26d..d6bed65f 100644
--- a/kona-camera.dtsi
+++ b/kona-camera.dtsi
@@ -1529,10 +1529,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -1540,16 +1540,17 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_a5: qcom,a5@ac00000 {
+	cam_icp: qcom,icp@ac00000 {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&titan_top_gdsc>;
 		clock-names =
diff --git a/lagoon-camera.dtsi b/lagoon-camera.dtsi
index b857cb42..ce57453f 100644
--- a/lagoon-camera.dtsi
+++ b/lagoon-camera.dtsi
@@ -796,25 +796,26 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
 	};
 
-	cam_a5: qcom,a5@ac00000 {
+	cam_icp: qcom,icp@ac00000 {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;
 		clock-names =
diff --git a/lahaina-camera.dtsi b/lahaina-camera.dtsi
index 096fc867..5220b5a3 100644
--- a/lahaina-camera.dtsi
+++ b/lahaina-camera.dtsi
@@ -1744,10 +1744,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -1755,16 +1755,17 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_a5: qcom,a5 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;
 		clock-names =
diff --git a/lito-camera.dtsi b/lito-camera.dtsi
index 0031a93f..acfe6614 100644
--- a/lito-camera.dtsi
+++ b/lito-camera.dtsi
@@ -755,27 +755,28 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,ipe1",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <2>;
 		num-bps = <1>;
 		icp_pc_en;
 		status = "ok";
 	};
 
-	cam_a5: qcom,a5 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&titan_top_gdsc>;
 		clock-names =
diff --git a/parrot-camera.dtsi b/parrot-camera.dtsi
index 925c02a9..770fbd59 100644
--- a/parrot-camera.dtsi
+++ b/parrot-camera.dtsi
@@ -1035,10 +1035,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,lx7",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-lx7 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -1046,15 +1046,16 @@
 		icp_use_pil;
 	};
 
-	cam_lx7: qcom,lx7 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-lx7";
+		compatible = "qcom,cam-icp_v2";
+		icp-version = <0x0200>;
 		reg = <0xac01000 0x400>,
 			<0xac01800 0x400>,
 			<0xac04000 0x1000>;
-		reg-names = "lx7_csr", "lx7_cirq", "lx7_wd0";
+		reg-names = "icp_csr", "icp_cirq", "icp_wd0";
 		reg-cam-base = <0x1000 0x1800 0x4000>;
-		interrupt-names = "lx7";
+		interrupt-names = "icp";
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "camss";
 		camss-supply = <&cam_cc_camss_top_gdsc>;
diff --git a/shima-camera.dtsi b/shima-camera.dtsi
index 7571aa22..6c6354d0 100644
--- a/shima-camera.dtsi
+++ b/shima-camera.dtsi
@@ -1137,10 +1137,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -1148,16 +1148,17 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_a5: qcom,a5 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;
 		clock-names =
diff --git a/waipio-camera.dtsi b/waipio-camera.dtsi
index aa51b9a2..e612a541 100644
--- a/waipio-camera.dtsi
+++ b/waipio-camera.dtsi
@@ -2493,10 +2493,10 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,lx7",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-lx7 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		status = "ok";
@@ -2505,15 +2505,16 @@
 		ipe_bps_pc_en;
 	};
 
-	cam_lx7: qcom,lx7 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-lx7";
+		compatible = "qcom,cam-icp_v2";
+		icp-version = <0x0200>;
 		reg = <0xac01000 0x400>,
 			<0xac01800 0x400>,
 			<0x0ac04000 0x1000>;
-		reg-names = "lx7_csr", "lx7_cirq", "lx7_wd0";
+		reg-names = "icp_csr", "icp_cirq", "icp_wd0";
 		reg-cam-base = <0x1000 0x1800 0x4000>;
-		interrupt-names = "lx7";
+		interrupt-names = "icp";
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
 		regulator-names = "gdsc";
 		gdsc-supply = <&cam_cc_titan_top_gdsc>;
diff --git a/yupik-camera.dtsi b/yupik-camera.dtsi
index 9cae295b..5c4b9cfe 100644
--- a/yupik-camera.dtsi
+++ b/yupik-camera.dtsi
@@ -923,26 +923,27 @@
 
 	qcom,cam-icp {
 		compatible = "qcom,cam-icp";
-		compat-hw-name = "qcom,a5",
+		compat-hw-name = "qcom,icp",
 			"qcom,ipe0",
 			"qcom,bps";
-		num-a5 = <1>;
+		num-icp = <1>;
 		num-ipe = <1>;
 		num-bps = <1>;
 		icp_pc_en;
 		status = "ok";
 	};
 
-	cam_a5: qcom,a5 {
+	cam_icp: qcom,icp {
 		cell-index = <0>;
-		compatible = "qcom,cam-a5";
+		compatible = "qcom,cam-icp_v1";
+		icp-version = <0x0100>;
 		reg = <0xac00000 0x6000>,
 			<0xac10000 0x8000>,
 			<0xac18000 0x3000>;
-		reg-names = "a5_qgic", "a5_sierra", "a5_csr";
+		reg-names = "icp_qgic", "icp_sierra", "icp_csr";
 		reg-cam-base = <0x00000 0x10000 0x18000>;
 		interrupts = <GIC_SPI 463 IRQ_TYPE_EDGE_RISING>;
-		interrupt-names = "a5";
+		interrupt-names = "icp";
 		regulator-names = "camss-vdd";
 		camss-vdd-supply = <&cam_cc_titan_top_gdsc>;
 		clock-names =