sw5100: Integrate LW 2.0 r00114.1android-wear-13.0.0_r0.15android-msm-p11-5.15-tm-wear-kr3-dr-p11

Bug: 294450523
Change-Id: I4608726ca14de163ff1c9934129d6a1d7464952b
Signed-off-by: John Artoux <jartoux@google.com>

8 files changed, 1280 insertions, 16 deletions

diff --git a/Kbuild b/Kbuild
index b851a8b..9830bc7 100755
--- a/Kbuild
+++ b/Kbuild
@@ -21,7 +21,8 @@ dtbo-y += monaco-dmic-audio.dtbo \
 		monaco-slate-wdp-v1-audio.dtbo \
 		monaco-slate-wsa-idp-v3-audio.dtbo \
 		monaco-wsa-audio.dtbo \
-		monaco-amic-audio-idp-v2.dtbo
+		monaco-amic-audio-idp-v2.dtbo \
+		monaco-audio-standalone-wdp-v1.dtbo
 endif
 
 ifeq ($(CONFIG_ARCH_SA8155), y)
diff --git a/direwolf-vm-audio.dtsi b/direwolf-vm-audio.dtsi
index df92565..46ac973 100755
--- a/direwolf-vm-audio.dtsi
+++ b/direwolf-vm-audio.dtsi
@@ -1,3 +1,1223 @@
+#include "msm-auto-vm-audio-lpass.dtsi"
+
+&msm_audio_ion {
+	iommus = <&apps_smmu 0x0c01 0x0>;
+	qcom,smmu-sid-mask = /bits/ 64 <0xf>;
+	/delete-property/ qcom,iommu-dma-addr-pool;
+};
+
+&tdm_sen_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37200>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36944 36946 36948
+						36950 36952 36954 36956 36958>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <0>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <1>;
+	qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
+
+
+	dai_sen_tdm_rx_1: qcom,msm-dai-q6-tdm-sen-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36946>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_2: qcom,msm-dai-q6-tdm-sen-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36948>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_3: qcom,msm-dai-q6-tdm-sen-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36950>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_4: qcom,msm-dai-q6-tdm-sen-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36952>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_5: qcom,msm-dai-q6-tdm-sen-rx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36954>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_6: qcom,msm-dai-q6-tdm-sen-rx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36956>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_rx_7: qcom,msm-dai-q6-tdm-sen-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36958>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_sen_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37201>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36945 36947 36949
+						36951 36953 36955 36957 36959>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <0>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <1>;
+	qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
+
+
+	dai_sen_tdm_tx_1: qcom,msm-dai-q6-tdm-sen-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36947>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_2: qcom,msm-dai-q6-tdm-sen-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36949>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_3: qcom,msm-dai-q6-tdm-sen-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36951>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_4: qcom,msm-dai-q6-tdm-sen-tx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36953>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_5: qcom,msm-dai-q6-tdm-sen-tx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36955>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_6: qcom,msm-dai-q6-tdm-sen-tx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36957>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sen_tdm_tx_7: qcom,msm-dai-q6-tdm-sen-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36959>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_sep_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37216>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36960 36962 36964
+						36966 36968 36970 36972 36974>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_sep_tdm_rx_1: qcom,msm-dai-q6-tdm-sep-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36962>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_2: qcom,msm-dai-q6-tdm-sep-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36964>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_3: qcom,msm-dai-q6-tdm-sep-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36966>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_4: qcom,msm-dai-q6-tdm-sep-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36968>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_5: qcom,msm-dai-q6-tdm-sep-rx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36970>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_6: qcom,msm-dai-q6-tdm-sep-rx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36972>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_rx_7: qcom,msm-dai-q6-tdm-sep-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36974>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_sep_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37217>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36961 36963 36965
+						36967 36969 36971 36973 36975>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_sep_tdm_tx_1: qcom,msm-dai-q6-tdm-sep-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36963>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_2: qcom,msm-dai-q6-tdm-sep-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36965>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_3: qcom,msm-dai-q6-tdm-sep-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36967>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_4: qcom,msm-dai-q6-tdm-sep-tx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36969>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_5: qcom,msm-dai-q6-tdm-sep-tx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36971>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_6: qcom,msm-dai-q6-tdm-sep-tx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36973>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_sep_tdm_tx_7: qcom,msm-dai-q6-tdm-sep-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36975>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif0_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37232>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36976 36978 36980
+						36982 36984 36986 36988 36990>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif0_tdm_rx_1: qcom,msm-dai-q6-tdm-hsif0-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36978>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_2: qcom,msm-dai-q6-tdm-hsif0-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36980>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_3: qcom,msm-dai-q6-tdm-hsif0-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36982>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_4: qcom,msm-dai-q6-tdm-hsif0-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36984>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_5: qcom,msm-dai-q6-tdm-hsif0-rx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36986>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_6: qcom,msm-dai-q6-tdm-hsif0-rx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36988>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_rx_7: qcom,msm-dai-q6-tdm-hsif0-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36990>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif0_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37233>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36977 36979 36981
+						36983 36985 36987 36989 36991>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif0_tdm_tx_1: qcom,msm-dai-q6-tdm-hsif0-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36979>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_2: qcom,msm-dai-q6-tdm-hsif0-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36981>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_3: qcom,msm-dai-q6-tdm-hsif0-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36983>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_4: qcom,msm-dai-q6-tdm-hsif0-tx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36985>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_5: qcom,msm-dai-q6-tdm-hsif0-tx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36987>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_6: qcom,msm-dai-q6-tdm-hsif0-tx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36989>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif0_tdm_tx_7: qcom,msm-dai-q6-tdm-hsif0-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36991>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif1_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37248>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36992 36994 36996
+						36998 37000 37002 37004 37006>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif1_tdm_rx_1: qcom,msm-dai-q6-tdm-hsif1-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36994>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_2: qcom,msm-dai-q6-tdm-hsif1-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36996>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_3: qcom,msm-dai-q6-tdm-hsif1-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36998>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_4: qcom,msm-dai-q6-tdm-hsif1-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37000>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_5: qcom,msm-dai-q6-tdm-hsif1-rx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37002>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_6: qcom,msm-dai-q6-tdm-hsif1-rx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37004>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_rx_7: qcom,msm-dai-q6-tdm-hsif1-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37006>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif1_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37249>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <36993 36995 36997
+						36999 37001 37003 37005 37007>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif1_tdm_tx_1: qcom,msm-dai-q6-tdm-hsif1-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36995>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_2: qcom,msm-dai-q6-tdm-hsif1-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36997>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_3: qcom,msm-dai-q6-tdm-hsif1-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <36999>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_4: qcom,msm-dai-q6-tdm-hsif1-tx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37001>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_5: qcom,msm-dai-q6-tdm-hsif1-tx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37003>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_6: qcom,msm-dai-q6-tdm-hsif1-tx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37005>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif1_tdm_tx_7: qcom,msm-dai-q6-tdm-hsif1-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37007>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif2_rx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37264>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <37008 37010 37012
+						37014 37016 37018 37020 37022>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif2_tdm_rx_1: qcom,msm-dai-q6-tdm-hsif2-rx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37010>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_2: qcom,msm-dai-q6-tdm-hsif2-rx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37012>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_3: qcom,msm-dai-q6-tdm-hsif2-rx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37014>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_4: qcom,msm-dai-q6-tdm-hsif2-rx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37016>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_5: qcom,msm-dai-q6-tdm-hsif2-rx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37018>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_6: qcom,msm-dai-q6-tdm-hsif2-rx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37020>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_rx_7: qcom,msm-dai-q6-tdm-hsif2-rx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37022>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&tdm_hsif2_tx {
+	compatible = "qcom,msm-dai-tdm";
+	qcom,msm-cpudai-tdm-group-id = <37265>;
+	qcom,msm-cpudai-tdm-group-num-ports = <8>;
+	qcom,msm-cpudai-tdm-group-port-id = <37009 37011 37013
+						37015 37017 37019 37021 37023>;
+	qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+	qcom,msm-cpudai-tdm-clk-internal = <1>;
+	qcom,msm-cpudai-tdm-sync-mode = <1>;
+	qcom,msm-cpudai-tdm-sync-src = <1>;
+	qcom,msm-cpudai-tdm-data-out = <0>;
+	qcom,msm-cpudai-tdm-invert-sync = <0>;
+	qcom,msm-cpudai-tdm-data-delay = <0>;
+
+
+	dai_hsif2_tdm_tx_1: qcom,msm-dai-q6-tdm-hsif2-tx-1 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37011>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_2: qcom,msm-dai-q6-tdm-hsif2-tx-2 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37013>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_3: qcom,msm-dai-q6-tdm-hsif2-tx-3 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37015>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_4: qcom,msm-dai-q6-tdm-hsif2-tx-4 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37017>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_5: qcom,msm-dai-q6-tdm-hsif2-tx-5 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37019>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_6: qcom,msm-dai-q6-tdm-hsif2-tx-6 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37021>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+
+	dai_hsif2_tdm_tx_7: qcom,msm-dai-q6-tdm-hsif2-tx-7 {
+		compatible = "qcom,msm-dai-q6-tdm";
+		qcom,msm-cpudai-tdm-dev-id = <37023>;
+		qcom,msm-cpudai-tdm-data-align = <0>;
+	};
+};
+
+&soc {
+	tdm_pri_rx: qcom,msm-dai-tdm-pri-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37120>;
+		qcom,msm-cpudai-tdm-group-num-ports = <4>;
+		qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36864>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_rx_1: qcom,msm-dai-q6-tdm-pri-rx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36866>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_rx_2: qcom,msm-dai-q6-tdm-pri-rx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36868>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_rx_3: qcom,msm-dai-q6-tdm-pri-rx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36870>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_pri_tx: qcom,msm-dai-tdm-pri-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37121>;
+		qcom,msm-cpudai-tdm-group-num-ports = <4>;
+		qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36865>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_tx_1: qcom,msm-dai-q6-tdm-pri-tx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36867>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_tx_2: qcom,msm-dai-q6-tdm-pri-tx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36869>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_pri_tdm_tx_3: qcom,msm-dai-q6-tdm-pri-tx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36871>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sec_rx: qcom,msm-dai-tdm-sec-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37136>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36880 36882 36884
+							36886 36894>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <0>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <0>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36880>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_rx_1: qcom,msm-dai-q6-tdm-sec-rx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36882>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_rx_2: qcom,msm-dai-q6-tdm-sec-rx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36884>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_rx_3: qcom,msm-dai-q6-tdm-sec-rx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36886>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_rx_7: qcom,msm-dai-q6-tdm-sec-rx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36894>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_sec_tx: qcom,msm-dai-tdm-sec-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37137>;
+		qcom,msm-cpudai-tdm-group-num-ports = <4>;
+		qcom,msm-cpudai-tdm-group-port-id = <36881 36883 36885 36887>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <0>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <0>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36881>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_tx_1: qcom,msm-dai-q6-tdm-sec-tx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36883>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_tx_2: qcom,msm-dai-q6-tdm-sec-tx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36885>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_sec_tdm_tx_3: qcom,msm-dai-q6-tdm-sec-tx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36887>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_tert_rx: qcom,msm-dai-tdm-tert-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37152>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900
+							36902 36904>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36896>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_rx_1: qcom,msm-dai-q6-tdm-tert-rx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36898>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_rx_2: qcom,msm-dai-q6-tdm-tert-rx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36900>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_rx_3: qcom,msm-dai-q6-tdm-tert-rx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36902>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36904>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_tert_tx: qcom,msm-dai-tdm-tert-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37153>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36897 36899 36901
+							36903 36911>;
+		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
+		qcom,msm-cpudai-tdm-clk-internal = <0>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <0>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <1>;
+		dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36897>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_tx_1: qcom,msm-dai-q6-tdm-tert-tx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36899>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_tx_2: qcom,msm-dai-q6-tdm-tert-tx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36901>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_tx_3: qcom,msm-dai-q6-tdm-tert-tx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36903>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_tert_tdm_tx_7: qcom,msm-dai-q6-tdm-tert-tx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36911>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quat_rx: qcom,msm-dai-tdm-quat-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37168>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36912 36914 36916
+							36918 36926>;
+		qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <10>;
+		dai_quat_tdm_rx_0: qcom,msm-dai-q6-tdm-quat-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36912>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_rx_1: qcom,msm-dai-q6-tdm-quat-rx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36914>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_rx_2: qcom,msm-dai-q6-tdm-quat-rx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36916>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_rx_3: qcom,msm-dai-q6-tdm-quat-rx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36918>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_rx_7: qcom,msm-dai-q6-tdm-quat-rx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36926>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quat_tx: qcom,msm-dai-tdm-quat-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37169>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36913 36915 36917
+							36919 36927>;
+		qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <5>;
+		dai_quat_tdm_tx_0: qcom,msm-dai-q6-tdm-quat-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36913>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_tx_1: qcom,msm-dai-q6-tdm-quat-tx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36915>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_tx_2: qcom,msm-dai-q6-tdm-quat-tx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36917>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_tx_3: qcom,msm-dai-q6-tdm-quat-tx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36919>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quat_tdm_tx_7: qcom,msm-dai-q6-tdm-quat-tx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36927>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quin_rx: qcom,msm-dai-tdm-quin-rx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37184>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36928 36930 36932
+							36934 36942>;
+		qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		dai_quin_tdm_rx_0: qcom,msm-dai-q6-tdm-quin-rx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36928>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_rx_1: qcom,msm-dai-q6-tdm-quin-rx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36930>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_rx_2: qcom,msm-dai-q6-tdm-quin-rx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36932>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_rx_3: qcom,msm-dai-q6-tdm-quin-rx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36934>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_rx_7: qcom,msm-dai-q6-tdm-quin-rx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36942>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	tdm_quin_tx: qcom,msm-dai-tdm-quin-tx {
+		compatible = "qcom,msm-dai-tdm";
+		qcom,msm-cpudai-tdm-group-id = <37185>;
+		qcom,msm-cpudai-tdm-group-num-ports = <5>;
+		qcom,msm-cpudai-tdm-group-port-id = <36929 36931 36933
+							36935 36943>;
+		qcom,msm-cpudai-tdm-clk-rate = <24576000>;
+		qcom,msm-cpudai-tdm-clk-internal = <1>;
+		qcom,msm-cpudai-tdm-sync-mode = <1>;
+		qcom,msm-cpudai-tdm-sync-src = <1>;
+		qcom,msm-cpudai-tdm-data-out = <0>;
+		qcom,msm-cpudai-tdm-invert-sync = <0>;
+		qcom,msm-cpudai-tdm-data-delay = <0>;
+		dai_quin_tdm_tx_0: qcom,msm-dai-q6-tdm-quin-tx-0 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36929>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_tx_1: qcom,msm-dai-q6-tdm-quin-tx-1 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36931>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_tx_2: qcom,msm-dai-q6-tdm-quin-tx-2 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36933>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_tx_3: qcom,msm-dai-q6-tdm-quin-tx-3 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36935>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+
+		dai_quin_tdm_tx_7: qcom,msm-dai-q6-tdm-quin-tx-7 {
+			compatible = "qcom,msm-dai-q6-tdm";
+			qcom,msm-cpudai-tdm-dev-id = <36943>;
+			qcom,msm-cpudai-tdm-data-align = <0>;
+		};
+	};
+
+	qcom,msm-dai-q6 {
+		compatible = "qcom,msm-dai-q6";
+
+		afe_pcm_rx_1: qcom,msm-dai-q6-be-afe-pcm-rx-1 {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <226>;
+		};
+
+		afe_proxy_tx_1: qcom,msm-dai-q6-afe-proxy-tx-1 {
+			compatible = "qcom,msm-dai-q6-dev";
+			qcom,msm-dai-q6-dev-id = <242>;
+		};
+	};
+};
+
+&audio_apr {
+	q6core: qcom,q6core-audio {
+		compatible = "qcom,q6core-audio";
+	};
+};
+
+&q6core {
+	snd_8295: sound-adp-star {
+		compatible = "qcom,sa8295-asoc-snd-adp-star";
+		qcom,model = "sa8295-adp-star-snd-card";
+		qcom,mi2s-audio-intf;
+		qcom,auxpcm-audio-intf;
+		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;
+
+		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
+				<&loopback>, <&compress>, <&hostless>,
+				<&afe>, <&lsm>, <&routing>, <&compr>,
+				<&pcm_noirq>, <&loopback1>, <&pcm_dtmf>;
+		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
+				"msm-pcm-dsp.2", "msm-voip-dsp",
+				"msm-pcm-voice", "msm-pcm-loopback",
+				"msm-compress-dsp", "msm-pcm-hostless",
+				"msm-pcm-afe", "msm-lsm-client",
+				"msm-pcm-routing", "msm-compr-dsp",
+				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
+				"msm-pcm-dtmf";
+		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_tx>,
+				<&dai_mi2s1_rx>, <&dai_mi2s1_tx>,
+				<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
+				<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
+				<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
+				<&dai_pri_auxpcm_rx>, <&dai_pri_auxpcm_tx>,
+				<&dai_sec_auxpcm_rx>, <&dai_sec_auxpcm_tx>,
+				<&dai_tert_auxpcm_rx>, <&dai_tert_auxpcm_tx>,
+				<&dai_quat_auxpcm_rx>, <&dai_quat_auxpcm_tx>,
+				<&dai_quin_auxpcm_rx>, <&dai_quin_auxpcm_tx>,
+				<&afe_pcm_rx>, <&afe_pcm_tx>,
+				<&afe_proxy_rx>, <&afe_proxy_tx>,
+				<&afe_pcm_rx_1>, <&afe_proxy_tx_1>,
+				<&incall_record_rx>, <&incall_record_tx>,
+				<&incall_music_rx>, <&incall_music_2_rx>,
+				<&usb_audio_rx>, <&usb_audio_tx>,
+				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,
+				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,
+				<&dai_pri_tdm_tx_0>, <&dai_pri_tdm_tx_1>,
+				<&dai_pri_tdm_tx_2>, <&dai_pri_tdm_tx_3>,
+				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_rx_1>,
+				<&dai_sec_tdm_rx_2>, <&dai_sec_tdm_rx_3>,
+				<&dai_sec_tdm_rx_7>, <&dai_sec_tdm_tx_0>,
+				<&dai_sec_tdm_tx_1>, <&dai_sec_tdm_tx_2>,
+				<&dai_sec_tdm_tx_3>, <&dai_tert_tdm_rx_0>,
+				<&dai_tert_tdm_rx_1>, <&dai_tert_tdm_rx_2>,
+				<&dai_tert_tdm_rx_3>, <&dai_tert_tdm_rx_4>,
+				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
+				<&dai_tert_tdm_tx_2>, <&dai_tert_tdm_tx_3>,
+				<&dai_tert_tdm_tx_7>, <&dai_quat_tdm_rx_0>,
+				<&dai_quat_tdm_rx_1>, <&dai_quat_tdm_rx_2>,
+				<&dai_quat_tdm_rx_3>, <&dai_quat_tdm_rx_7>,
+				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
+				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>,
+				<&dai_quat_tdm_tx_7>, <&dai_quin_tdm_rx_0>,
+				<&dai_quin_tdm_rx_1>, <&dai_quin_tdm_rx_2>,
+				<&dai_quin_tdm_rx_3>, <&dai_quin_tdm_rx_7>,
+				<&dai_quin_tdm_tx_0>, <&dai_quin_tdm_tx_1>,
+				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
+				<&dai_quin_tdm_tx_7>, <&dai_sen_tdm_rx_0>,
+				<&dai_sen_tdm_rx_1>, <&dai_sen_tdm_rx_2>,
+				<&dai_sen_tdm_rx_3>, <&dai_sen_tdm_rx_4>,
+				<&dai_sen_tdm_rx_5>, <&dai_sen_tdm_rx_6>,
+				<&dai_sen_tdm_rx_7>, <&dai_sen_tdm_tx_0>,
+				<&dai_sen_tdm_tx_1>, <&dai_sen_tdm_tx_2>,
+				<&dai_sen_tdm_tx_3>, <&dai_sen_tdm_tx_4>,
+				<&dai_sen_tdm_tx_5>, <&dai_sen_tdm_tx_6>,
+				<&dai_sen_tdm_tx_7>, <&dai_sep_tdm_rx_0>,
+				<&dai_sep_tdm_rx_1>, <&dai_sep_tdm_rx_2>,
+				<&dai_sep_tdm_rx_3>, <&dai_sep_tdm_rx_4>,
+				<&dai_sep_tdm_rx_5>, <&dai_sep_tdm_rx_6>,
+				<&dai_sep_tdm_rx_7>, <&dai_sep_tdm_tx_0>,
+				<&dai_sep_tdm_tx_1>, <&dai_sep_tdm_tx_2>,
+				<&dai_sep_tdm_tx_3>, <&dai_sep_tdm_tx_4>,
+				<&dai_sep_tdm_tx_5>, <&dai_sep_tdm_tx_6>,
+				<&dai_sep_tdm_tx_7>, <&dai_hsif0_tdm_rx_0>,
+				<&dai_hsif0_tdm_rx_1>, <&dai_hsif0_tdm_rx_2>,
+				<&dai_hsif0_tdm_rx_3>, <&dai_hsif0_tdm_rx_4>,
+				<&dai_hsif0_tdm_rx_5>, <&dai_hsif0_tdm_rx_6>,
+				<&dai_hsif0_tdm_rx_7>, <&dai_hsif0_tdm_tx_0>,
+				<&dai_hsif0_tdm_tx_1>, <&dai_hsif0_tdm_tx_2>,
+				<&dai_hsif0_tdm_tx_3>, <&dai_hsif0_tdm_tx_4>,
+				<&dai_hsif0_tdm_tx_5>, <&dai_hsif0_tdm_tx_6>,
+				<&dai_hsif0_tdm_tx_7>,<&dai_hsif1_tdm_rx_0>,
+				<&dai_hsif1_tdm_rx_1>, <&dai_hsif1_tdm_rx_2>,
+				<&dai_hsif1_tdm_rx_3>, <&dai_hsif1_tdm_rx_4>,
+				<&dai_hsif1_tdm_rx_5>, <&dai_hsif1_tdm_rx_6>,
+				<&dai_hsif1_tdm_rx_7>, <&dai_hsif1_tdm_tx_0>,
+				<&dai_hsif1_tdm_tx_1>, <&dai_hsif1_tdm_tx_2>,
+				<&dai_hsif1_tdm_tx_3>, <&dai_hsif1_tdm_tx_4>,
+				<&dai_hsif1_tdm_tx_5>, <&dai_hsif1_tdm_tx_6>,
+				<&dai_hsif1_tdm_tx_7>, <&dai_hsif2_tdm_rx_0>,
+				<&dai_hsif2_tdm_rx_1>, <&dai_hsif2_tdm_rx_2>,
+				<&dai_hsif2_tdm_rx_3>, <&dai_hsif2_tdm_rx_4>,
+				<&dai_hsif2_tdm_rx_5>, <&dai_hsif2_tdm_rx_6>,
+				<&dai_hsif2_tdm_rx_7>, <&dai_hsif2_tdm_tx_0>,
+				<&dai_hsif2_tdm_tx_1>, <&dai_hsif2_tdm_tx_2>,
+				<&dai_hsif2_tdm_tx_3>, <&dai_hsif2_tdm_tx_4>,
+				<&dai_hsif2_tdm_tx_5>, <&dai_hsif2_tdm_tx_6>,
+				<&dai_hsif2_tdm_tx_7>;
+		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.0",
+				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
+				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
+				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
+				"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
+				"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
+				"msm-dai-q6-auxpcm.1","msm-dai-q6-auxpcm.2",
+				"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",
+				"msm-dai-q6-auxpcm.5", "msm-dai-q6-auxpcm.6",
+				"msm-dai-q6-auxpcm.7", "msm-dai-q6-auxpcm.8",
+				"msm-dai-q6-auxpcm.9", "msm-dai-q6-auxpcm.10",
+				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
+				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
+				"msm-dai-q6-dev.226", "msm-dai-q6-dev.242",
+				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",
+				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",
+				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",
+				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36866",
+				"msm-dai-q6-tdm.36868", "msm-dai-q6-tdm.36870",
+				"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36867",
+				"msm-dai-q6-tdm.36869", "msm-dai-q6-tdm.36871",
+				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36882",
+				"msm-dai-q6-tdm.36884", "msm-dai-q6-tdm.36886",
+				"msm-dai-q6-tdm.36894", "msm-dai-q6-tdm.36881",
+				"msm-dai-q6-tdm.36883", "msm-dai-q6-tdm.36885",
+				"msm-dai-q6-tdm.36887", "msm-dai-q6-tdm.36896",
+				"msm-dai-q6-tdm.36898", "msm-dai-q6-tdm.36900",
+				"msm-dai-q6-tdm.36902", "msm-dai-q6-tdm.36904",
+				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",
+				"msm-dai-q6-tdm.36901", "msm-dai-q6-tdm.36903",
+				"msm-dai-q6-tdm.36911", "msm-dai-q6-tdm.36912",
+				"msm-dai-q6-tdm.36914", "msm-dai-q6-tdm.36916",
+				"msm-dai-q6-tdm.36918", "msm-dai-q6-tdm.36926",
+				"msm-dai-q6-tdm.36913", "msm-dai-q6-tdm.36915",
+				"msm-dai-q6-tdm.36917", "msm-dai-q6-tdm.36919",
+				"msm-dai-q6-tdm.36927", "msm-dai-q6-tdm.36928",
+				"msm-dai-q6-tdm.36930", "msm-dai-q6-tdm.36932",
+				"msm-dai-q6-tdm.36934", "msm-dai-q6-tdm.36942",
+				"msm-dai-q6-tdm.36929", "msm-dai-q6-tdm.36931",
+				"msm-dai-q6-tdm.36933", "msm-dai-q6-tdm.36935",
+				"msm-dai-q6-tdm.36943", "msm-dai-q6-tdm.36944",
+				"msm-dai-q6-tdm.36946", "msm-dai-q6-tdm.36948",
+				"msm-dai-q6-tdm.36950", "msm-dai-q6-tdm.36952",
+				"msm-dai-q6-tdm.36954", "msm-dai-q6-tdm.36956",
+				"msm-dai-q6-tdm.36958", "msm-dai-q6-tdm.36945",
+				"msm-dai-q6-tdm.36947", "msm-dai-q6-tdm.36949",
+				"msm-dai-q6-tdm.36951", "msm-dai-q6-tdm.36953",
+				"msm-dai-q6-tdm.36955", "msm-dai-q6-tdm.36957",
+				"msm-dai-q6-tdm.36959", "msm-dai-q6-tdm.36960",
+				"msm-dai-q6-tdm.36962", "msm-dai-q6-tdm.36964",
+				"msm-dai-q6-tdm.36966", "msm-dai-q6-tdm.36968",
+				"msm-dai-q6-tdm.36970", "msm-dai-q6-tdm.36972",
+				"msm-dai-q6-tdm.36974", "msm-dai-q6-tdm.36961",
+				"msm-dai-q6-tdm.36963", "msm-dai-q6-tdm.36965",
+				"msm-dai-q6-tdm.36967", "msm-dai-q6-tdm.36969",
+				"msm-dai-q6-tdm.36971", "msm-dai-q6-tdm.36973",
+				"msm-dai-q6-tdm.36975", "msm-dai-q6-tdm.36976",
+				"msm-dai-q6-tdm.36978", "msm-dai-q6-tdm.36980",
+				"msm-dai-q6-tdm.36982", "msm-dai-q6-tdm.36984",
+				"msm-dai-q6-tdm.36986", "msm-dai-q6-tdm.36988",
+				"msm-dai-q6-tdm.36990", "msm-dai-q6-tdm.36977",
+				"msm-dai-q6-tdm.36979", "msm-dai-q6-tdm.36981",
+				"msm-dai-q6-tdm.36983", "msm-dai-q6-tdm.36985",
+				"msm-dai-q6-tdm.36987", "msm-dai-q6-tdm.36989",
+				"msm-dai-q6-tdm.36991", "msm-dai-q6-tdm.36992",
+				"msm-dai-q6-tdm.36994", "msm-dai-q6-tdm.36996",
+				"msm-dai-q6-tdm.36998", "msm-dai-q6-tdm.37000",
+				"msm-dai-q6-tdm.37002", "msm-dai-q6-tdm.37004",
+				"msm-dai-q6-tdm.37006", "msm-dai-q6-tdm.36993",
+				"msm-dai-q6-tdm.36995", "msm-dai-q6-tdm.36997",
+				"msm-dai-q6-tdm.36999", "msm-dai-q6-tdm.37001",
+				"msm-dai-q6-tdm.37003", "msm-dai-q6-tdm.37005",
+				"msm-dai-q6-tdm.37007", "msm-dai-q6-tdm.37008",
+				"msm-dai-q6-tdm.37010", "msm-dai-q6-tdm.37012",
+				"msm-dai-q6-tdm.37014", "msm-dai-q6-tdm.37016",
+				"msm-dai-q6-tdm.37018", "msm-dai-q6-tdm.37020",
+				"msm-dai-q6-tdm.37022", "msm-dai-q6-tdm.37009",
+				"msm-dai-q6-tdm.37011", "msm-dai-q6-tdm.37013",
+				"msm-dai-q6-tdm.37015", "msm-dai-q6-tdm.37017",
+				"msm-dai-q6-tdm.37019", "msm-dai-q6-tdm.37021",
+				"msm-dai-q6-tdm.37023";
+		asoc-codec = <&stub_codec>;
+		asoc-codec-names = "msm-stub-codec.1";
+		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
+	};
+};
 &soc {
 	snd_8295_ar: sound-adp-star {
 		compatible = "qcom,gvm-auto-spf-asoc-snd-adp-star";
@@ -5,8 +1225,4 @@
 		asoc-codec = <&stub_codec>;
 		asoc-codec-names = "msm-stub-codec.1";
 	};
-
-	stub_codec: qcom,msm-stub-codec {
-		compatible = "qcom,msm-stub-codec";
-	};
 };
diff --git a/direwolf-vm-la-audio.dts b/direwolf-vm-la-audio.dts
index e8a53d0..d77ba04 100755
--- a/direwolf-vm-la-audio.dts
+++ b/direwolf-vm-la-audio.dts
@@ -12,5 +12,5 @@
 	model = "Qualcomm Technologies, Inc. SA8295 Virtual Machine";
 	compatible = "qcom,direwolf", "qcom,quinvm";
 	qcom,msm-id = <460 0x10000>;
-	qcom,board-id = <0 0x1000001>;
+	qcom,board-id = <0 0x1000001>, <0x0 0x2000001>;
 };
diff --git a/monaco-audio-standalone-wdp-v1.dts b/monaco-audio-standalone-wdp-v1.dts
new file mode 100755
index 0000000..5f8f9de
--- /dev/null
+++ b/monaco-audio-standalone-wdp-v1.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "monaco-audio.dtsi"
+#include "monaco-audio-overlay.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Monaco standalone WDP V1.0";
+	qcom,board-id = <0x010024 0x1>;
+};
+
diff --git a/sa525m-audio-lpass.dtsi b/sa525m-audio-lpass.dtsi
index f2e6ddc..6c44246 100755
--- a/sa525m-audio-lpass.dtsi
+++ b/sa525m-audio-lpass.dtsi
@@ -30,9 +30,9 @@
 		compatible = "qcom,msm-stub-codec";
 	};
 
-	prim_master: prim_master_pinctrl {
+	prim_master_slave: prim_master_slave_pinctrl {
 		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-names = "aud_active", "aud_sleep", "aud_alt_active";
 		pinctrl-0 = <&pri_ws_active_master
 				&pri_sck_active_master
 				&pri_dout_active
@@ -41,6 +41,10 @@
 				&pri_sck_sleep
 				&pri_dout_sleep
 				&pri_din_sleep>;
+		pinctrl-2 = <&pri_ws_active_slave
+				&pri_sck_active_slave
+				&pri_dout_active
+				&pri_din_active>;
 		qcom,mi2s-auxpcm-cdc-gpios;
 	};
 
@@ -59,9 +63,9 @@
 		qcom,mi2s-auxpcm-cdc-gpios;
 	};
 
-	sec_master: sec_master_pinctrl {
+	sec_master_slave: sec_master_slave_pinctrl {
 		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-names = "aud_active", "aud_sleep", "aud_alt_active";
 		pinctrl-0 = <&sec_ws_active_master
 				&sec_sck_active_master
 				&sec_dout_active
@@ -70,6 +74,10 @@
 				&sec_sck_sleep
 				&sec_dout_sleep
 				&sec_din_sleep>;
+		pinctrl-2 = <&sec_ws_active_slave
+				&sec_sck_active_slave
+				&sec_dout_active
+				&sec_din_active>;
 		qcom,mi2s-auxpcm-cdc-gpios;
 	};
 
@@ -88,9 +96,9 @@
 		qcom,mi2s-auxpcm-cdc-gpios;
 	};
 
-	tert_master: tert_master_pinctrl {
+	tert_master_slave: tert_master_slave_pinctrl {
 		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
+		pinctrl-names = "aud_active", "aud_sleep", "aud_alt_active";
 		pinctrl-0 = <&tert_ws_active_master
 				&tert_sck_active_master
 				&tert_dout_active
@@ -99,6 +107,10 @@
 				&tert_sck_sleep
 				&tert_dout_sleep
 				&tert_din_sleep>;
+		pinctrl-2 = <&tert_ws_active_slave
+				&tert_sck_active_slave
+				&tert_dout_active
+				&tert_din_active>;
 		qcom,mi2s-auxpcm-cdc-gpios;
 	};
 
diff --git a/sa525m-audio-overlay.dtsi b/sa525m-audio-overlay.dtsi
index 0bf07d2..5e0a287 100755
--- a/sa525m-audio-overlay.dtsi
+++ b/sa525m-audio-overlay.dtsi
@@ -31,17 +31,19 @@
 		snd_tlv3x: sound-auto {
 		compatible = "qcom,sdx-asoc-snd-auto";
 		qcom,model = "sdx-auto-i2s-snd-card";
-		qcom,prim_mi2s_aux_master = <&prim_master>;
+		qcom,prim_mi2s_aux_master = <&prim_master_slave>;
 		qcom,prim_mi2s_aux_slave = <&prim_slave>;
-		qcom,sec_mi2s_aux_master = <&sec_master>;
+		qcom,sec_mi2s_aux_master = <&sec_master_slave>;
 		qcom,sec_mi2s_aux_slave = <&sec_slave>;
-		qcom,tert_mi2s_aux_master = <&tert_master>;
+		qcom,tert_mi2s_aux_master = <&tert_master_slave>;
 		qcom,tert_mi2s_aux_slave = <&tert_slave>;
 
 		pinctrl-names = "default";
 		pinctrl-0 =  <&i2s_mclk_active &tlv_reset_active &tlv_cdc_power>;
 		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;
 		asoc-codec-names = "tlv320aic3x", "msm-stub-codec.1";
+
+		qcom,msm_audio_ssr_devs = <&audio_gpr>;
 	};
 };
 
diff --git a/sa8155-audio.dtsi b/sa8155-audio.dtsi
index 4b0d973..1daa56e 100755
--- a/sa8155-audio.dtsi
+++ b/sa8155-audio.dtsi
@@ -603,6 +603,12 @@
 	audio_pkt_core_platform: audio-pkt-platform {
 		compatible = "qcom,audio-pkt-core-platform";
 	};
+
+	coupled_ssr: qcom,coupled_ssr {
+		compatible = "qcom,coupled_ssr";
+		status = "ok";
+		qcom,msm-coupled-ssr-group = <&adsp_pas &modem_pas>;
+	};
 };
 
 &glink_edge {
@@ -630,6 +636,21 @@
 	};
 };
 
+&glink_edge_modem {
+	modem_gpr: qcom,modem_gpr {
+		compatible = "qcom,gpr";
+		qcom,glink-channels = "modem_apps";
+		qcom,intents = <0x200 20>;
+		reg = <GPR_DOMAIN_MODEM>;
+
+		ams-modem-pkt {
+			compatible = "qcom,audio-pkt";
+			qcom,audiopkt-ch-name = "apr_modem_ams_svc";
+			reg = <GPR_SVC_MAX>;
+		};
+	};
+};
+
 &spf_core_platform {
 	spf_msm_audio_ion: qcom,spf-msm-audio-ion {
 		compatible = "qcom,msm-audio-ion";
@@ -708,6 +729,7 @@
 		qcom,quin-tdm-gpios = <&spf_tdm_quin_rx>;
 		asoc-codec = <&stub_codec>;
 		asoc-codec-names = "msm-stub-codec.1";
+		qcom,msm_audio_ssr_devs = <&audio_gpr>;
 	};
 };
 
diff --git a/sdxpinn-audio.dts b/sdxpinn-audio.dts
index af21c61..6a7cf66 100755
--- a/sdxpinn-audio.dts
+++ b/sdxpinn-audio.dts
@@ -13,5 +13,5 @@
 	model = "Qualcomm Technologies, Inc. SDXPINN";
 	compatible = "qcom,sdxpinn";
 	qcom,msm-id = <556 0x10000>, <580 0x10000>;
-	qcom,board-id = <0x5010022 773>, <0x4010022 772>, <0x3020022 1027>, <0x4020022 772>, <0x20015 768>, <0x2020022 770>, <15 1024>, <0x10015 768>, <0x5020022 773>, <0x2010022 770>, <0x3010022 1027>, <0x4030022 772>, <0x2010022 0x402>;
+	qcom,board-id = <0x4010022 772>, <0x3020022 1027>, <0x4020022 772>, <0x20015 768>, <0x2020022 770>, <15 1024>, <0x10015 768>, <0x2010022 770>, <0x3010022 1027>, <0x4030022 772>, <0x2010022 0x402>;
 };