diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index 2841131a..d98ddbe9 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -451,8 +451,18 @@
 	};
 
 	camcc: clock-controller@ade0000 {
-		compatible = "qcom,dummycc";
-		clock-output-names = "camcc_clocks";
+		compatible = "qcom,sun-camcc", "syscon";
+		reg = <0xade0000 0x20000>;
+		reg-name = "cc_base";
+		vdd_mm-supply = <&VDD_MM_LEVEL>;
+		vdd_mx-supply = <&VDD_MX_LEVEL>;
+		vdd_mxc-supply = <&VDD_MXC_LEVEL>;
+		clocks = <&rpmhcc RPMH_CXO_CLK>,
+			 <&sleep_clk>,
+			 <&gcc GCC_CAMERA_AHB_CLK>;
+		clock-names = "bi_tcxo",
+			      "sleep_clk",
+			      "iface";
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -535,35 +545,59 @@
 
 	/* CAM_CC GDSCs */
 	cam_cc_ipe_0_gdsc: qcom,gdsc@adf017c {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf017c 0x4>;
 		regulator-name = "cam_cc_ipe_0_gdsc";
+		parent-supply = <&cam_cc_titan_top_gdsc>;
+		qcom,retain-regs;
 		qcom,support-hw-trigger;
+		qcom,support-cfg-gdscr;
 	};
 
 	cam_cc_ofe_gdsc: qcom,gdsc@adf00c8 {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf00c8 0x4>;
 		regulator-name = "cam_cc_ofe_gdsc";
+		parent-supply = <&cam_cc_titan_top_gdsc>;
+		qcom,retain-regs;
 		qcom,support-hw-trigger;
+		qcom,support-cfg-gdscr;
 	};
 
 	cam_cc_tfe_0_gdsc: qcom,gdsc@adf1004 {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf1004 0x4>;
 		regulator-name = "cam_cc_tfe_0_gdsc";
+		parent-supply = <&cam_cc_titan_top_gdsc>;
+		qcom,retain-regs;
+		qcom,support-cfg-gdscr;
 	};
 
 	cam_cc_tfe_1_gdsc: qcom,gdsc@adf1084 {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf1084 0x4>;
 		regulator-name = "cam_cc_tfe_1_gdsc";
+		parent-supply = <&cam_cc_titan_top_gdsc>;
+		qcom,retain-regs;
+		qcom,support-cfg-gdscr;
 	};
 
 	cam_cc_tfe_2_gdsc: qcom,gdsc@adf10ec {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf10ec 0x4>;
 		regulator-name = "cam_cc_tfe_2_gdsc";
+		parent-supply = <&cam_cc_titan_top_gdsc>;
+		qcom,retain-regs;
+		qcom,support-cfg-gdscr;
 	};
 
 	cam_cc_titan_top_gdsc: qcom,gdsc@adf134c {
-		compatible = "qcom,stub-regulator";
+		compatible = "qcom,gdsc";
+		reg = <0xadf134c 0x4>;
 		regulator-name = "cam_cc_titan_top_gdsc";
+		parent-supply = <&VDD_MM_MXC_VOTER_LEVEL>;
+		qcom,retain-regs;
+		qcom,support-cfg-gdscr;
 	};
 
 	/* DISP_CC GDSCs */