diff --git a/Kbuild b/Kbuild
index 56c8f1c3..69722a73 100644
--- a/Kbuild
+++ b/Kbuild
@@ -23,7 +23,9 @@ dtbo-y += sun-audio.dtbo \
                 sun-audio-qrd.dtbo \
                 sun-audio-qrd-sku2.dtbo \
                 sun-audio-atp.dtbo \
-                sun-audio-rcm.dtbo
+                sun-audio-rcm.dtbo \
+                sun-audio-hamilton-cdp.dtbo \
+                sun-audio-hamilton-mtp.dtbo
 endif
 
  always-y    := $(dtb-y) $(dtbo-y)
diff --git a/sun-audio-atp.dts b/sun-audio-atp.dts
index 17bf29ec..b498be6b 100644
--- a/sun-audio-atp.dts
+++ b/sun-audio-atp.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun ATP";
 	compatible = "qcom,sun-atp", "qcom,sun", "qcom,atp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x10021 0>;
 };
diff --git a/sun-audio-cdp-nfc.dts b/sun-audio-cdp-nfc.dts
index b9b0e235..c307a023 100644
--- a/sun-audio-cdp-nfc.dts
+++ b/sun-audio-cdp-nfc.dts
@@ -11,6 +11,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP ST54L NFC";
 	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x50001 0>;
-};
\ No newline at end of file
+};
diff --git a/sun-audio-cdp.dts b/sun-audio-cdp.dts
index fab0bb24..65782f6a 100644
--- a/sun-audio-cdp.dts
+++ b/sun-audio-cdp.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
 	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
-	qcom,board-id = <1 0>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <1 0>, <0x50001 0>;
 };
diff --git a/sun-audio-hamilton-cdp.dts b/sun-audio-hamilton-cdp.dts
new file mode 100644
index 00000000..df15e4bd
--- /dev/null
+++ b/sun-audio-hamilton-cdp.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+/*This is CDP with Hamilton wlan*/
+
+#include "sun-audio-hamilton-cdp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun CDP";
+	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x20001 0>, <0x60001 0>;
+};
+
diff --git a/sun-audio-mtp-nfc.dtsi b/sun-audio-hamilton-cdp.dtsi
similarity index 54%
rename from sun-audio-mtp-nfc.dtsi
rename to sun-audio-hamilton-cdp.dtsi
index f05bf979..bbbe89d8 100644
--- a/sun-audio-mtp-nfc.dtsi
+++ b/sun-audio-hamilton-cdp.dtsi
@@ -3,4 +3,8 @@
  * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
-#include "sun-audio-overlay.dtsi"
+/*This is CDP with Hamilton wlan*/
+#include "sun-audio-cdp.dtsi"
+&lpass_bt_swr {
+	status = "disabled";
+};
diff --git a/sun-audio-hamilton-mtp.dts b/sun-audio-hamilton-mtp.dts
new file mode 100644
index 00000000..a4db1f54
--- /dev/null
+++ b/sun-audio-hamilton-mtp.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+/*This is MTP with Hamilton + V8/V6 wlan*/
+
+#include "sun-audio-hamilton-mtp.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x20008 0>, <0x50008 0>;
+};
+
diff --git a/sun-audio-hamilton-mtp.dtsi b/sun-audio-hamilton-mtp.dtsi
new file mode 100644
index 00000000..87fe4155
--- /dev/null
+++ b/sun-audio-hamilton-mtp.dtsi
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "sun-audio-mtp.dtsi"
+
+&lpass_bt_swr {
+	status = "disabled";
+};
+
+&sun_snd {
+	qcom,model = "sun-mtp-wsa883x-snd-card";
+};
+
diff --git a/sun-audio-mtp-nfc.dts b/sun-audio-mtp-nfc.dts
index 2ae836e2..674406b5 100644
--- a/sun-audio-mtp-nfc.dts
+++ b/sun-audio-mtp-nfc.dts
@@ -6,11 +6,13 @@
 /dts-v1/;
 /plugin/;
 
-#include "sun-audio-mtp-nfc.dtsi"
+/*This is MTP with Ganges wlan w/ v8 Power Grid */
+
+#include "sun-audio-mtp.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
-	qcom,board-id = <0x50008 0>;
-};
\ No newline at end of file
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x30008 0>, <0x40008 0>;
+};
diff --git a/sun-audio-mtp.dts b/sun-audio-mtp.dts
index b4617be3..323b7b9a 100644
--- a/sun-audio-mtp.dts
+++ b/sun-audio-mtp.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <8 0>;
 };
diff --git a/sun-audio-qrd-sku2.dts b/sun-audio-qrd-sku2.dts
index 0eb73fc3..914ec927 100644
--- a/sun-audio-qrd-sku2.dts
+++ b/sun-audio-qrd-sku2.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun QRD";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x2000B 0>;
 };
diff --git a/sun-audio-qrd.dts b/sun-audio-qrd.dts
index f21a31a7..711a5fad 100644
--- a/sun-audio-qrd.dts
+++ b/sun-audio-qrd.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun QRD";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x1000B 0>, <0x3000B 0>;
 };
diff --git a/sun-audio-rcm.dts b/sun-audio-rcm.dts
index 342a8b83..76412e1b 100644
--- a/sun-audio-rcm.dts
+++ b/sun-audio-rcm.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun RCM";
 	compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <0x15 0>;
 };
diff --git a/sun-audio-rumi.dts b/sun-audio-rumi.dts
index c885f98e..2db458a0 100644
--- a/sun-audio-rumi.dts
+++ b/sun-audio-rumi.dts
@@ -10,6 +10,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun RUMI";
 	compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
 	qcom,board-id = <15 0>;
 };