diff --git a/sun-audio-atp.dts b/sun-audio-atp.dts
index b498be6b..575dbb4a 100644
--- a/sun-audio-atp.dts
+++ b/sun-audio-atp.dts
@@ -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.
  */
 
 /dts-v1/;
@@ -9,7 +9,8 @@
 #include "sun-audio-atp.dtsi"
  / {
 	model = "Qualcomm Technologies, Inc. Sun ATP";
-	compatible = "qcom,sun-atp", "qcom,sun", "qcom,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,board-id = <0x10021 0>;
 };
diff --git a/sun-audio-atp.dtsi b/sun-audio-atp.dtsi
index 5d5ca97b..bcbfa830 100644
--- a/sun-audio-atp.dtsi
+++ b/sun-audio-atp.dtsi
@@ -1,77 +1,9 @@
 // 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-mtp.dtsi"
-
-&swr_haptics {
-    status = "disabled";
-};
-
-&sun_snd {
-	asoc-codec  = <&stub_codec>, <&lpass_cdc>,
-		<&wcd939x_codec>, <&wsa884x_0220>,
-		<&wsa884x_0221>;
-	asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
-		"wcd939x_codec", "wsa-codec1", "wsa-codec2";
-	swr-haptics-unsupported;
-		qcom,audio-routing =
-			"AMIC1", "Analog Mic1",
-			"AMIC1", "MIC BIAS1",
-			"AMIC2", "Analog Mic2",
-			"AMIC2", "MIC BIAS2",
-			"AMIC3", "Analog Mic3",
-			"AMIC3", "MIC BIAS3",
-			"AMIC4", "Analog Mic4",
-			"AMIC4", "MIC BIAS3",
-			"AMIC5", "Analog Mic5",
-			"AMIC5", "MIC BIAS4",
-			"VA AMIC1", "Analog Mic1",
-			"VA AMIC1", "VA MIC BIAS1",
-			"VA AMIC2", "Analog Mic2",
-			"VA AMIC2", "VA MIC BIAS2",
-			"VA AMIC3", "Analog Mic3",
-			"VA AMIC3", "VA MIC BIAS3",
-			"VA AMIC4", "Analog Mic4",
-			"VA AMIC4", "VA MIC BIAS3",
-			"VA AMIC5", "Analog Mic5",
-			"VA AMIC5", "VA MIC BIAS4",
-			"TX DMIC0", "Digital Mic0",
-			"TX DMIC0", "MIC BIAS3",
-			"TX DMIC1", "Digital Mic1",
-			"TX DMIC1", "MIC BIAS3",
-			"TX DMIC2", "Digital Mic2",
-			"TX DMIC2", "MIC BIAS1",
-			"TX DMIC3", "Digital Mic3",
-			"TX DMIC3", "MIC BIAS1",
-			"IN1_HPHL", "HPHL_OUT",
-			"IN2_HPHR", "HPHR_OUT",
-			"IN3_EAR", "AUX_OUT",
-			"WSA SRC0_INP", "SRC0",
-			"WSA_TX DEC0_INP", "TX DEC0 MUX",
-			"WSA_TX DEC1_INP", "TX DEC1 MUX",
-			"RX_TX DEC0_INP", "TX DEC0 MUX",
-			"RX_TX DEC1_INP", "TX DEC1 MUX",
-			"RX_TX DEC2_INP", "TX DEC2 MUX",
-			"RX_TX DEC3_INP", "TX DEC3 MUX",
-			"SpkrLeft IN", "WSA_SPK1 OUT",
-			"SpkrRight IN", "WSA_SPK2 OUT",
-			"TX SWR_INPUT", "WCD_TX_OUTPUT",
-			"VA SWR_INPUT", "VA_SWR_CLK",
-			"VA SWR_INPUT", "WCD_TX_OUTPUT",
-			"VA_AIF1 CAP", "VA_SWR_CLK",
-			"VA_AIF2 CAP", "VA_SWR_CLK",
-			"VA_AIF3 CAP", "VA_SWR_CLK",
-			"VA DMIC0", "Digital Mic0",
-			"VA DMIC1", "Digital Mic1",
-			"VA DMIC2", "Digital Mic2",
-			"VA DMIC3", "Digital Mic3",
-			"VA DMIC0", "VA MIC BIAS3",
-			"VA DMIC1", "VA MIC BIAS3",
-			"VA DMIC2", "VA MIC BIAS1",
-			"VA DMIC3", "VA MIC BIAS1";
-};
+#include "sun-audio-cdp.dtsi"
 
 &wsa_macro {
 	qcom,wsa-bat-cfgs= <4>, <4>;
@@ -80,3 +12,7 @@
 &wsa2_macro {
 	qcom,wsa-bat-cfgs= <4>, <4>;
 };
+
+&swr_haptics {
+	status = "disabled";
+};