diff --git a/Kbuild b/Kbuild
index ec9f9945..1ba1bdcd 100644
--- a/Kbuild
+++ b/Kbuild
@@ -21,7 +21,9 @@ dtbo-y += sun-audio.dtbo \
                 sun-audio-mtp.dtbo \
                 sun-audio-mtp-3.5mm.dtbo \
                 sun-audio-mtp-nfc.dtbo \
+                sun-audio-mtp-qmp.dtbo \
                 sun-audio-qrd.dtbo \
+                sun-audio-hdk.dtbo \
                 sun-audio-qrd-sku2.dtbo \
                 sun-audio-atp.dtbo \
                 sun-audio-rcm.dtbo \
diff --git a/pineapple-audio-overlay.dtsi b/pineapple-audio-overlay.dtsi
index 9842d780..42e31c80 100644
--- a/pineapple-audio-overlay.dtsi
+++ b/pineapple-audio-overlay.dtsi
@@ -409,7 +409,7 @@
 		qcom,model = "pineapple-mtp-snd-card";
 		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
 		qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
-		qcom,wcn-bt = <0>;
+		qcom,wcn-bt = <1>;
 		qcom,ext-disp-audio-rx = <0>;
 		qcom,tdm-max-slots = <8>;
 		qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
diff --git a/sun-audio-atp.dts b/sun-audio-atp.dts
index 575dbb4a..37f3e975 100644
--- a/sun-audio-atp.dts
+++ b/sun-audio-atp.dts
@@ -11,6 +11,8 @@
 	model = "Qualcomm Technologies, Inc. Sun ATP";
 	compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp",
 				"qcom,atp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x10021 0>;
 };
diff --git a/sun-audio-cdp-nfc.dts b/sun-audio-cdp-nfc.dts
index c307a023..80d5e254 100644
--- a/sun-audio-cdp-nfc.dts
+++ b/sun-audio-cdp-nfc.dts
@@ -11,6 +11,8 @@
 / {
 	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>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x50001 0>;
 };
diff --git a/sun-audio-cdp.dts b/sun-audio-cdp.dts
index 65782f6a..f3960ba9 100644
--- a/sun-audio-cdp.dts
+++ b/sun-audio-cdp.dts
@@ -10,6 +10,8 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
 	compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <1 0>, <0x50001 0>;
 };
diff --git a/sun-audio-hamilton-cdp.dts b/sun-audio-hamilton-cdp.dts
index df15e4bd..392b4a19 100644
--- a/sun-audio-hamilton-cdp.dts
+++ b/sun-audio-hamilton-cdp.dts
@@ -13,7 +13,9 @@
 / {
 	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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x20001 0>, <0x60001 0>;
 };
 
diff --git a/sun-audio-hamilton-mtp.dts b/sun-audio-hamilton-mtp.dts
index a4db1f54..56cdbfea 100644
--- a/sun-audio-hamilton-mtp.dts
+++ b/sun-audio-hamilton-mtp.dts
@@ -13,7 +13,9 @@
 / {
 	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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x20008 0>, <0x50008 0>;
 };
 
diff --git a/sun-audio-hamilton-rcm.dts b/sun-audio-hamilton-rcm.dts
index c1de3779..b36404fd 100644
--- a/sun-audio-hamilton-rcm.dts
+++ b/sun-audio-hamilton-rcm.dts
@@ -10,6 +10,8 @@
 / {
 	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>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x20015 0>, <0x40015 0>;
 };
diff --git a/sun-audio-hdk.dts b/sun-audio-hdk.dts
new file mode 100644
index 00000000..d78bb014
--- /dev/null
+++ b/sun-audio-hdk.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-audio-qrd.dtsi"
+ / {
+	model = "Qualcomm Technologies, Inc. SunP QRD HDK";
+	compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk";
+	qcom,msm-id = <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>,
+			<618 0x10000>, <618 0x20000>;
+	qcom,board-id = <0x1001f 0>;
+};
diff --git a/sun-audio-mtp-3.5mm.dts b/sun-audio-mtp-3.5mm.dts
index 8148cf7a..00c8b934 100644
--- a/sun-audio-mtp-3.5mm.dts
+++ b/sun-audio-mtp-3.5mm.dts
@@ -19,6 +19,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP with 3.5mm";
 	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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x60008 0>;
 };
diff --git a/sun-audio-mtp-nfc.dts b/sun-audio-mtp-nfc.dts
index 674406b5..de023590 100644
--- a/sun-audio-mtp-nfc.dts
+++ b/sun-audio-mtp-nfc.dts
@@ -13,6 +13,8 @@
 / {
 	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,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x30008 0>, <0x40008 0>;
 };
diff --git a/sun-audio-mtp-qmp.dts b/sun-audio-mtp-qmp.dts
index 6bd0e533..35111fb1 100644
--- a/sun-audio-mtp-qmp.dts
+++ b/sun-audio-mtp-qmp.dts
@@ -11,6 +11,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP QMP1000";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp", "qcom,sunp-mtp", "qcom,sunp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
-	qcom,board-id = <0x10108 0>, <0x40108 0>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
+	qcom,board-id = <0x108 0>, <0x40108 0>;
 };
diff --git a/sun-audio-mtp-qmp.dtsi b/sun-audio-mtp-qmp.dtsi
index 1c2894c5..bf53f3cf 100644
--- a/sun-audio-mtp-qmp.dtsi
+++ b/sun-audio-mtp-qmp.dtsi
@@ -64,7 +64,7 @@
 };
 
 &sun_snd {
-	qcom,model = "sun-mtp-wsa883x-qmp-snd-card";
+	qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
 	asoc-codec  = <&stub_codec>, <&lpass_cdc>,
 			<&wcd939x_codec>, <&swr_haptics>,
 			<&wsa883x_0221>, <&wsa883x_0222>,
@@ -128,10 +128,10 @@
 		"VA SWR_INPUT", "QMP_MIC02 LP_OUTPUT",
 		"VA SWR_INPUT", "QMP_MIC03 LP_OUTPUT",
 		"VA SWR_INPUT", "QMP_MIC04 LP_OUTPUT",
-		"VA SWR_INPUT", "QMP_MIC01 NORMAL_OUTPUT",
-		"VA SWR_INPUT", "QMP_MIC02 NORMAL_OUTPUT",
-		"VA SWR_INPUT", "QMP_MIC03 NORMAL_OUTPUT",
-		"VA SWR_INPUT", "QMP_MIC04 NORMAL_OUTPUT",
+		"VA SWR_INPUT", "QMP_MIC01 VA_NORMAL_OUTPUT",
+		"VA SWR_INPUT", "QMP_MIC02 VA_NORMAL_OUTPUT",
+		"VA SWR_INPUT", "QMP_MIC03 VA_NORMAL_OUTPUT",
+		"VA SWR_INPUT", "QMP_MIC04 VA_NORMAL_OUTPUT",
 		"VA_AIF1 CAP", "VA_SWR_CLK",
 		"VA_AIF2 CAP", "VA_SWR_CLK",
 		"VA_AIF3 CAP", "VA_SWR_CLK",
diff --git a/sun-audio-mtp.dts b/sun-audio-mtp.dts
index 323b7b9a..80e2f9be 100644
--- a/sun-audio-mtp.dts
+++ b/sun-audio-mtp.dts
@@ -10,6 +10,8 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
 	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <8 0>;
 };
diff --git a/sun-audio-mtp.dtsi b/sun-audio-mtp.dtsi
index 4b08fb38..82af8e21 100644
--- a/sun-audio-mtp.dtsi
+++ b/sun-audio-mtp.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /*
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "sun-audio-overlay.dtsi"
@@ -120,6 +120,7 @@
 		cdc-vdd-1p8-supply = <&L15B>;
 		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-1p8-current = <20000>;
+		qcom,cdc-vdd-1p8-lpm-supported = <1>;
 		qcom,cdc-static-supplies = "cdc-vdd-1p8";
 		sound-name-prefix = "SpkrLeft";
 	};
@@ -132,6 +133,7 @@
 		cdc-vdd-1p8-supply = <&L15B>;
 		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-1p8-current = <20000>;
+		qcom,cdc-vdd-1p8-lpm-supported = <1>;
 		qcom,cdc-static-supplies = "cdc-vdd-1p8";
 		sound-name-prefix = "SpkrRight";
 	};
@@ -146,6 +148,7 @@
 		cdc-vdd-1p8-supply = <&L15B>;
 		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-1p8-current = <20000>;
+		qcom,cdc-vdd-1p8-lpm-supported = <1>;
 		qcom,cdc-static-supplies = "cdc-vdd-1p8";
 		sound-name-prefix = "Spkr2Left";
 		status = "disabled";
@@ -159,6 +162,7 @@
 		cdc-vdd-1p8-supply = <&L15B>;
 		qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
 		qcom,cdc-vdd-1p8-current = <20000>;
+		qcom,cdc-vdd-1p8-lpm-supported = <1>;
 		qcom,cdc-static-supplies = "cdc-vdd-1p8";
 		sound-name-prefix = "Spkr2Right";
 		status = "disabled";
diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi
index 0f0cc03e..4b193856 100644
--- a/sun-audio-overlay.dtsi
+++ b/sun-audio-overlay.dtsi
@@ -238,7 +238,7 @@
 				<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,
 				<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
 				<6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>,
-				<8 SPKR_HAPT 0x1>, <9 OCPM 0x3>,
+				<8 SPKR_HAPT 0x1>, <9 OCPM 0x1>,
 				<10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>,
 				<12 SPKR_IPCM 0x3>, <13 CPS 0x3>;
 			qcom,swr-num-dev = <3>;
@@ -287,7 +287,7 @@
 				compatible = "qcom,pmih010x-swr-haptics";
 				reg = <0x03 0xf0170220>;
 				swr-slave-supply = <&hap_swr_slave_reg>;
-				qcom,rx_swr_ch_map = <0 0x01 0x01 0 SPKR_HAPT>;
+				qcom,rx_swr_ch_map = <0 0x01 0x01 0 OCPM>;
 			};
 		};
 	};
@@ -417,6 +417,12 @@
 		qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
 		qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
 		qcom,audio-core-list = <0>, <1>;
+		/*
+		 * Add this property,
+		 * To Enable swr haptics through OPCM port.
+		 * This will include wsa2 dailinks.
+		 */
+		qcom,dedicated-wsa2;
 		qcom,audio-routing =
 			"AMIC1", "Analog Mic1",
 			"AMIC1", "MIC BIAS1",
@@ -449,7 +455,7 @@
 			"IN1_HPHL", "HPHL_OUT",
 			"IN2_HPHR", "HPHR_OUT",
 			"IN3_EAR", "AUX_OUT",
-			"HAP_IN", "WSA_HAPT OUT",
+			"HAP_IN", "WSA2_HAPT OUT",
 			"WSA SRC0_INP", "SRC0",
 			"WSA_TX DEC0_INP", "TX DEC0 MUX",
 			"WSA_TX DEC1_INP", "TX DEC1 MUX",
diff --git a/sun-audio-qrd-sku2.dts b/sun-audio-qrd-sku2.dts
index 914ec927..af418d34 100644
--- a/sun-audio-qrd-sku2.dts
+++ b/sun-audio-qrd-sku2.dts
@@ -10,6 +10,8 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun QRD";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x2000B 0>;
 };
diff --git a/sun-audio-qrd.dts b/sun-audio-qrd.dts
index 711a5fad..8d0b0a20 100644
--- a/sun-audio-qrd.dts
+++ b/sun-audio-qrd.dts
@@ -10,6 +10,8 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun QRD";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x1000B 0>, <0x3000B 0>;
 };
diff --git a/sun-audio-rcm.dts b/sun-audio-rcm.dts
index e7841ce8..d4d47c70 100644
--- a/sun-audio-rcm.dts
+++ b/sun-audio-rcm.dts
@@ -10,6 +10,8 @@
  / {
 	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>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x15 0>, <0x30015 0>;
 };
diff --git a/sun-audio-rumi.dts b/sun-audio-rumi.dts
index 2db458a0..9a1b2107 100644
--- a/sun-audio-rumi.dts
+++ b/sun-audio-rumi.dts
@@ -10,6 +10,8 @@
  / {
 	model = "Qualcomm Technologies, Inc. Sun RUMI";
 	compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <15 0>;
 };
diff --git a/sun-audio.dts b/sun-audio.dts
index fc743327..e9362b0b 100644
--- a/sun-audio.dts
+++ b/sun-audio.dts
@@ -16,6 +16,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun";
 	compatible = "qcom,sun";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+			<0x100026a 0x10000>, <0x100026a 0x20000>,
+			<0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0 0>;
 };