diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi
index a1efb3ce..6c86c763 100644
--- a/qcom/tuna.dtsi
+++ b/qcom/tuna.dtsi
@@ -757,15 +757,40 @@
 	};
 
 	cambistmclkcc: clock-controller@1760000 {
-		compatible = "qcom,dummycc";
-		clock-output-names = "cambistmclkcc_clocks";
+		compatible = "qcom,tuna-cambistmclkcc", "syscon";
+		reg = <0x1760000 0x6000>;
+		reg-name = "cc_base";
+		vdd_mx-supply = <&VDD_MX_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>;
 	};
 
+
+	cam_crm: syscon@adcd600 {
+		compatible = "syscon";
+		reg = <0xadcd600 0x2000>;
+	};
+
 	camcc: clock-controller@ade0000 {
-		compatible = "qcom,dummycc";
-		clock-output-names = "camcc_clocks";
+		compatible = "qcom,tuna-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";
+		qcom,cam_crm-crmc = <&cam_crm>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};
@@ -992,32 +1017,33 @@
 #include "tuna-gdsc.dtsi"
 
 &cam_cc_ipe_0_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
 	status = "ok";
 };
 
 &cam_cc_ofe_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
 	status = "ok";
 };
 
 &cam_cc_tfe_0_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
 	status = "ok";
 };
 
 &cam_cc_tfe_1_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
 	status = "ok";
 };
 
 &cam_cc_tfe_2_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
 	status = "ok";
 };
 
 &cam_cc_titan_top_gdsc {
-	compatible = "regulator-fixed";
+	compatible = "qcom,gdsc";
+	parent-supply = <&VDD_MM_MXC_VOTER_LEVEL>;
 	status = "ok";
 };