diff --git a/cape-camera-sensor-cdp.dtsi b/cape-camera-sensor-cdp.dtsi
index d7f6964f..fdbe369f 100644
--- a/cape-camera-sensor-cdp.dtsi
+++ b/cape-camera-sensor-cdp.dtsi
@@ -766,7 +766,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;
diff --git a/cape-camera-sensor-mtp.dtsi b/cape-camera-sensor-mtp.dtsi
index 599d6932..f6df714b 100644
--- a/cape-camera-sensor-mtp.dtsi
+++ b/cape-camera-sensor-mtp.dtsi
@@ -847,7 +847,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;
diff --git a/cape-camera-sensor-qrd.dtsi b/cape-camera-sensor-qrd.dtsi
index 599d6932..f6df714b 100644
--- a/cape-camera-sensor-qrd.dtsi
+++ b/cape-camera-sensor-qrd.dtsi
@@ -847,7 +847,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;
diff --git a/kalama-camera-sensor-cdp.dtsi b/kalama-camera-sensor-cdp.dtsi
index e00f357c..d6c86350 100644
--- a/kalama-camera-sensor-cdp.dtsi
+++ b/kalama-camera-sensor-cdp.dtsi
@@ -438,7 +438,7 @@
 		regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana",
 			"cam_v_custom1";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-max-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-load-current = <6000 454000 0  77900 29400>;
diff --git a/kalama-camera-sensor-mtp.dtsi b/kalama-camera-sensor-mtp.dtsi
index e00f357c..d6c86350 100644
--- a/kalama-camera-sensor-mtp.dtsi
+++ b/kalama-camera-sensor-mtp.dtsi
@@ -438,7 +438,7 @@
 		regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana",
 			"cam_v_custom1";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-max-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-load-current = <6000 454000 0  77900 29400>;
diff --git a/kalama-camera-sensor-qrd.dtsi b/kalama-camera-sensor-qrd.dtsi
index e00f357c..d6c86350 100644
--- a/kalama-camera-sensor-qrd.dtsi
+++ b/kalama-camera-sensor-qrd.dtsi
@@ -438,7 +438,7 @@
 		regulator-names = "cam_vio", "cam_vdig","cam_clk", "cam_vana",
 			"cam_v_custom1";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-max-voltage = <1800000 1056000 0 2800000 1800000>;
 		rgltr-load-current = <6000 454000 0  77900 29400>;
diff --git a/waipio-camera-sensor-cdp.dtsi b/waipio-camera-sensor-cdp.dtsi
index f43b51d9..a0cd73e9 100644
--- a/waipio-camera-sensor-cdp.dtsi
+++ b/waipio-camera-sensor-cdp.dtsi
@@ -766,7 +766,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;
diff --git a/waipio-camera-sensor-mtp.dtsi b/waipio-camera-sensor-mtp.dtsi
index 2b5cd8fb..d8739dfd 100644
--- a/waipio-camera-sensor-mtp.dtsi
+++ b/waipio-camera-sensor-mtp.dtsi
@@ -847,7 +847,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;
diff --git a/waipio-camera-sensor-qrd.dtsi b/waipio-camera-sensor-qrd.dtsi
index c902f214..62f23a63 100644
--- a/waipio-camera-sensor-qrd.dtsi
+++ b/waipio-camera-sensor-qrd.dtsi
@@ -578,7 +578,7 @@
 		regulator-names = "cam_vio", "cam_vana", "cam_clk", "cam_vdig",
 			"cam_bob";
 		rgltr-cntrl-support;
-		aon-user;
+		aon-camera-id = <AON_CAM1>;
 		rgltr-min-voltage = <1800000 2704000 0 952000 3008000>;
 		rgltr-max-voltage = <1800000 2896000 0 1144000 3960000>;
 		rgltr-load-current = <10000 14720 0 30000 7070000>;