diff --git a/qcom/sun-oemvm.dtsi b/qcom/sun-oemvm.dtsi
index 239f2f0e..6d78f6cd 100644
--- a/qcom/sun-oemvm.dtsi
+++ b/qcom/sun-oemvm.dtsi
@@ -197,6 +197,15 @@
 				qcom,label = <0x3>;
 			};
 
+			mem-buf-message-queue-pair {
+				vdevice-type = "message-queue-pair";
+				generate = "/hypervisor/membuf-msgq-pair";
+				message-size = <0x000000f0>;
+				queue-depth = <0x00000008>;
+				peer-default;
+				qcom,label = <0x000000C>;
+			};
+
 			qrtr-shm {
 				vdevice-type = "shm-doorbell";
 				generate = "/hypervisor/qrtr-shm";
@@ -211,7 +220,7 @@
 	};
 
 	firmware: firmware {
-		scm {
+		qcom_scm: scm {
 			compatible = "qcom,scm";
 		};
 	};
@@ -252,11 +261,23 @@
 
 	qcom,mem-buf {
 		compatible = "qcom,mem-buf";
+		qcom,mem-buf-capabilities = "consumer";
+		qcom,ipa-range = <0x0 0x0 0xf 0xffffffff>;
+		qcom,dmabuf-ipa-size = <0x1 0x00000000>; /* 4GB IPA space for dmabuf */
 		qcom,vmid = <49>;
 	};
 
 	qcom,mem-buf-msgq {
 		compatible = "qcom,mem-buf-msgq";
+		qcom,msgq-names = "oem_vm";
+	};
+
+	virtio_mem_device {
+		compatible = "qcom,virtio-mem";
+		/* Must be memory_block_size_bytes() aligned */
+		qcom,max-size = <0x0 0x10000000>;
+		qcom,ipa-range = <0x0 0x0 0xf 0xffffffff>;
+		qcom,block-size = <0x400000>;
 	};
 
 	qcom,test-dbl-oemvm {
@@ -304,3 +325,4 @@
 		msgq-label = <3>;
 	};
 };
+#include "sun-vm-dma-heaps.dtsi"
diff --git a/qcom/sun-vm.dtsi b/qcom/sun-vm.dtsi
index 2da5090e..4518418d 100644
--- a/qcom/sun-vm.dtsi
+++ b/qcom/sun-vm.dtsi
@@ -692,6 +692,7 @@
 
 	qcom,mem-buf-msgq {
 		compatible = "qcom,mem-buf-msgq";
+		qcom,msgq-names = "trusted_vm";
 	};
 
 	virtio_mem_device {
diff --git a/qcom/sun.dtsi b/qcom/sun.dtsi
index aaf869c4..4fb640fd 100644
--- a/qcom/sun.dtsi
+++ b/qcom/sun.dtsi
@@ -904,15 +904,16 @@
 		qcom,vmid = <3>;
 	};
 
+	qcom,mem-buf-msgq {
+		compatible = "qcom,mem-buf-msgq";
+		qcom,msgq-names = "trusted_vm", "oem_vm";
+	};
+
 	qcom,hdcp {
 		compatible = "qcom,hdcp";
 		qcom,use-smcinvoke = <1>;
 	};
 
-	qcom,mem-buf-msgq {
-	       compatible = "qcom,mem-buf-msgq";
-	};
-
 	qti,smmu-proxy {
 		compatible = "smmu-proxy-sender";
 	};