ARM: dts: msm: Update the GCC/RPMH/AOP clock node for SDXPRAIRIE

Update the GCC, RPMh, and AOP nodes to use the the real clock
controller for all clock controller clients and updating clock
nodes in RUMI.

Change-Id: I5c25b0d7af8724dd3796479748673cea6112834a
Signed-off-by: Naveen Yadav <naveenky@codeaurora.org>

arch/arm64/boot/dts/qcom/sdxprairie-rumi.dtsi

@@ -40,25 +40,21 @@
 				     0x10060 0x3c
 				     0x0 0x4>;
 	};
+};
 
-	clock_rpmh: qcom,rpmh {
-		compatible = "qcom,dummycc";
-		clock-output-names = "rpmh_clocks";
-		#clock-cells = <1>;
-	};
+&clock_rpmh {
+	compatible = "qcom,dummycc";
+	clock-output-names = "rpmh_clocks";
+};
 
-	clock_aop: qcom,aop {
-		compatible = "qcom,dummycc";
-		clock-output-names = "aop_clocks";
-		#clock-cells = <1>;
-	};
+&clock_aop {
+	compatible = "qcom,dummycc";
+	clock-output-names = "aop_clocks";
+};
 
-	clock_gcc: qcom,gcc {
-		compatible = "qcom,dummycc";
-		clock-output-names = "gcc_clocks";
-		#clock-cells = <1>;
-		#reset-cells = <1>;
-	};
+&clock_gcc {
+	compatible = "qcom,dummycc";
+	clock-output-names = "gcc_clocks";
 };
 
 &ipa_hw {

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

@@ -209,20 +209,28 @@
 	};
 
 	clock_rpmh: qcom,rpmh {
-		compatible = "qcom,dummycc";
-		clock-output-names = "rpmh_clocks";
+		compatible = "qcom,rpmh-clk-sdxprairie";
+		mboxes = <&apps_rsc 0>;
+		mbox-names = "apps";
 		#clock-cells = <1>;
 	};
 
 	clock_aop: qcom,aop {
-		compatible = "qcom,dummycc";
-		clock-output-names = "aop_clocks";
+		compatible = "qcom,aop-qmp-clk";
+		mboxes = <&qmp_aop 0>;
+		mbox-names = "qdss_clk";
 		#clock-cells = <1>;
 	};
 
-	clock_gcc: qcom,gcc {
-		compatible = "qcom,dummycc";
-		clock-output-names = "gcc_clocks";
+	clock_gcc: qcom,gcc@100000 {
+		compatible = "qcom,gcc-sdxprairie", "syscon";
+		reg = <0x100000 0x1f0000>;
+		reg-names = "cc_base";
+		clocks = <&clock_rpmh RPMH_CXO_CLK>;
+		clock-names = "bi_tcxo";
+		vdd_cx-supply = <&VDD_CX_LEVEL>;
+		vdd_cx_ao-supply = <&VDD_CX_LEVEL_AO>;
+		vdd_mx-supply = <&VDD_MX_LEVEL>;
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 	};