diff --git a/qcom/shima-rumi.dtsi b/qcom/shima-rumi.dtsi
index ac7084807882..da35118a0fde 100644
--- a/qcom/shima-rumi.dtsi
+++ b/qcom/shima-rumi.dtsi
@@ -102,3 +102,8 @@
 &gcc {
 	clocks = <&bi_tcxo>, <&bi_tcxo_ao>, <&sleep_clk>;
 };
+
+&aopcc {
+	compatible = "qcom,dummycc";
+	clock-output-names = "qdss_clocks";
+};
diff --git a/qcom/shima.dtsi b/qcom/shima.dtsi
index 2630a21d540e..9cb471e8bec1 100644
--- a/qcom/shima.dtsi
+++ b/qcom/shima.dtsi
@@ -570,10 +570,10 @@
 	};
 
 	aopcc: qcom,aopcc {
-		compatible = "qcom,dummycc";
-		clock-output-names = "aopcc_clocks";
+		compatible = "qcom,aop-qmp-clk";
+		mboxes = <&qmp_aop 0>;
+		mbox-names = "qdss_clk";
 		#clock-cells = <1>;
-		#reset-cells = <1>;
 	};
 
 	gcc: clock-controller@100000 {