diff --git a/qcom/pineapple-dma-heaps.dtsi b/qcom/pineapple-dma-heaps.dtsi
index 96792535..6044a2d9 100644
--- a/qcom/pineapple-dma-heaps.dtsi
+++ b/qcom/pineapple-dma-heaps.dtsi
@@ -8,6 +8,7 @@
 &soc {
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
+		depends-on-supply = <&qcom_scm>;
 
 		qcom,display {
 			qcom,dma-heap-name = "qcom,display";
diff --git a/qcom/pineapple-vm-dma-heaps.dtsi b/qcom/pineapple-vm-dma-heaps.dtsi
index aa415523..3af63dfb 100644
--- a/qcom/pineapple-vm-dma-heaps.dtsi
+++ b/qcom/pineapple-vm-dma-heaps.dtsi
@@ -7,6 +7,7 @@
 &soc {
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
+		depends-on-supply = <&qcom_scm>;
 
 		qcom,tui {
 			qcom,dma-heap-name = "qcom,tui";
diff --git a/qcom/pineapple-vm.dtsi b/qcom/pineapple-vm.dtsi
index e135fdf0..ed4ab46b 100644
--- a/qcom/pineapple-vm.dtsi
+++ b/qcom/pineapple-vm.dtsi
@@ -235,7 +235,7 @@
 	};
 
 	firmware: firmware {
-		scm {
+		qcom_scm: qcom_scm {
 			compatible = "qcom,scm";
 		};
 	};
diff --git a/qcom/pineapple.dtsi b/qcom/pineapple.dtsi
index c531514f..37184b34 100644
--- a/qcom/pineapple.dtsi
+++ b/qcom/pineapple.dtsi
@@ -53,7 +53,9 @@
 		qcom,qmp = <&aoss_qmp>;
 	};
 
-	firmware: firmware { };
+	firmware: firmware {
+		qcom_scm: qcom_scm { };
+	};
 
 	cpus {
 		#address-cells = <2>;
diff --git a/qcom/sun-dma-heaps.dtsi b/qcom/sun-dma-heaps.dtsi
index f0def0d5..25350f01 100644
--- a/qcom/sun-dma-heaps.dtsi
+++ b/qcom/sun-dma-heaps.dtsi
@@ -8,6 +8,7 @@
 &soc {
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
+		depends-on-supply = <&qcom_scm>;
 
 		qcom,display {
 			qcom,dma-heap-name = "qcom,display";
diff --git a/qcom/sun-vm-dma-heaps.dtsi b/qcom/sun-vm-dma-heaps.dtsi
index 24e9b7e8..f5c44fd0 100644
--- a/qcom/sun-vm-dma-heaps.dtsi
+++ b/qcom/sun-vm-dma-heaps.dtsi
@@ -7,6 +7,7 @@
 &soc {
 	qcom,dma-heaps {
 		compatible = "qcom,dma-heaps";
+		depends-on-supply = <&qcom_scm>;
 
 		qcom,tui {
 			qcom,dma-heap-name = "qcom,tui";
diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi
index a402927e..e9a22c28 100644
--- a/qcom/sun-vm.dtsi
+++ b/qcom/sun-vm.dtsi
@@ -283,7 +283,7 @@
 	};
 
 	firmware: firmware {
-		scm {
+		qcom_scm: qcom_scm {
 			compatible = "qcom,scm";
 		};
 	};
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index 427ec21c..dfac7c37 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -45,7 +45,9 @@
 		mmc1 = &sdhc_2; /* SDC2 SD card slot */
 	};
 
-	firmware: firmware { };
+	firmware: firmware {
+		qcom_scm: qcom_scm { };
+	};
 
 	cpus {
 		#address-cells = <2>;
@@ -303,7 +305,7 @@
 };
 
 &firmware {
-	qcom-scm {
+	qcom_scm {
 		compatible = "qcom,scm";
 		qcom,dload-mode = <&tcsr 0x19000>;
 	};