diff --git a/qcom/Makefile b/qcom/Makefile
index a2a27d6845c3..5f1b12aadb91 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -141,7 +141,9 @@ endif
 
 ifeq ($(CONFIG_ARCH_LAHAINA), y)
 ifeq ($(CONFIG_ARCH_QTI_VM), y)
-dtb-$(CONFIG_ARCH_QTI_VM) += trustedvm.dtb
+dtb-$(CONFIG_ARCH_QTI_VM) += lahaina-vm-mtp.dtb \
+	lahaina-vm-cdp.dtb \
+	lahaina-vm-qrd.dtb
 endif
 endif
 
diff --git a/qcom/lahaina-vm-cdp.dts b/qcom/lahaina-vm-cdp.dts
new file mode 100644
index 000000000000..74e1fc3fdae7
--- /dev/null
+++ b/qcom/lahaina-vm-cdp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-vm.dtsi"
+#include "lahaina-vm-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina SVM CDP";
+	compatible = "qcom,lahaina-cdp", "qcom,lahaina", "qcom,cdp";
+	qcom,board-id = <0x10001 0>;
+};
diff --git a/qcom/lahaina-vm-cdp.dtsi b/qcom/lahaina-vm-cdp.dtsi
new file mode 100644
index 000000000000..e62004ae5e1e
--- /dev/null
+++ b/qcom/lahaina-vm-cdp.dtsi
@@ -0,0 +1 @@
+/*#include "display/lahaina-sde-display-cdp.dtsi"*/
diff --git a/qcom/trustedvm-ion.dtsi b/qcom/lahaina-vm-ion.dtsi
similarity index 100%
rename from qcom/trustedvm-ion.dtsi
rename to qcom/lahaina-vm-ion.dtsi
diff --git a/qcom/lahaina-vm-mtp.dts b/qcom/lahaina-vm-mtp.dts
new file mode 100644
index 000000000000..816a8fc0d9df
--- /dev/null
+++ b/qcom/lahaina-vm-mtp.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-vm.dtsi"
+#include "lahaina-vm-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina SVM MTP";
+	compatible = "qcom,lahaina-mtp", "qcom,lahaina", "qcom,mtp";
+	qcom,board-id = <0x10008 0>;
+};
diff --git a/qcom/lahaina-vm-mtp.dtsi b/qcom/lahaina-vm-mtp.dtsi
new file mode 100644
index 000000000000..7411556ed73b
--- /dev/null
+++ b/qcom/lahaina-vm-mtp.dtsi
@@ -0,0 +1 @@
+/*#include "display/lahaina-sde-display-mtp.dtsi"*/
diff --git a/qcom/lahaina-vm-qrd.dts b/qcom/lahaina-vm-qrd.dts
new file mode 100644
index 000000000000..4c01845cfd2c
--- /dev/null
+++ b/qcom/lahaina-vm-qrd.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "lahaina-vm.dtsi"
+#include "lahaina-vm-qrd.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Lahaina SVM QRD";
+	compatible = "qcom,lahaina-qrd", "qcom,lahaina", "qcom,qrd";
+	qcom,board-id = <0x1000B 0>;
+};
diff --git a/qcom/lahaina-vm-qrd.dtsi b/qcom/lahaina-vm-qrd.dtsi
new file mode 100644
index 000000000000..ed306e6a6f78
--- /dev/null
+++ b/qcom/lahaina-vm-qrd.dtsi
@@ -0,0 +1 @@
+/*#include "display/lahaina-sde-display-qrd.dtsi"*/
diff --git a/qcom/trustedvm.dtsi b/qcom/lahaina-vm.dtsi
similarity index 99%
rename from qcom/trustedvm.dtsi
rename to qcom/lahaina-vm.dtsi
index 10f4431c38c4..456517912aa2 100644
--- a/qcom/trustedvm.dtsi
+++ b/qcom/lahaina-vm.dtsi
@@ -6,6 +6,7 @@
 / {
 	#address-cells = <0x2>;
 	#size-cells = <0x2>;
+	qcom,msm-id = <415 0x10000>;
 	interrupt-parent = <&vgic>;
 
 	qcom-mem-buf {
@@ -321,7 +322,7 @@
 	};
 };
 
-#include "trustedvm-ion.dtsi"
+#include "lahaina-vm-ion.dtsi"
 #include "display/trustedvm-lahaina-sde.dtsi"
 #include "display/trustedvm-lahaina-sde-display.dtsi"
 #include "display/dsi-panel-sw43404-amoled-dsc-wqhd-cmd.dtsi"
diff --git a/qcom/trustedvm.dts b/qcom/trustedvm.dts
deleted file mode 100644
index e8db5262cc91..000000000000
--- a/qcom/trustedvm.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/dts-v1/;
-
-#include "trustedvm.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Secondary Virtual Machine";
-};