diff --git a/bindings/sound/qcom-audio-dev.txt b/bindings/sound/qcom-audio-dev.txt
index 5c4fd50ae840..e6e028d832d2 100644
--- a/bindings/sound/qcom-audio-dev.txt
+++ b/bindings/sound/qcom-audio-dev.txt
@@ -1444,8 +1444,10 @@ Example:
 				"msm-pcm-routing", "msm-cpe-lsm",
 				"msm-compr-dsp", "msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+				<&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_pri_auxpcm>, <&dai_sec_auxpcm>,
 				<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
 				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
@@ -1468,6 +1470,8 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"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-auxpcm.1", "msm-dai-q6-auxpcm.2",
 				"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",
 				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -1578,9 +1582,12 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1608,7 +1615,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-dp.24608",
 				"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-auxpcm.1",
+				"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-dev.224",
@@ -1714,9 +1724,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1748,7 +1761,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
@@ -1857,9 +1873,12 @@ Example:
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+		asoc-cpu = <&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -1885,7 +1904,10 @@ Example:
 				<&tx_cdc_dma_6_tx>, <&tx_cdc_dma_7_tx>;
 		asoc-cpu-names = "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-auxpcm.1",
+				"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-dev.224",
@@ -2147,9 +2169,12 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2176,7 +2201,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-dp.24608",
 				"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-auxpcm.1",
+				"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-dev.224",
@@ -2300,9 +2328,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&dai_mi2s0_rx>, <&dai_mi2s0_rx>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2334,7 +2365,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
@@ -2444,9 +2478,13 @@ Example:
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&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_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -2479,6 +2517,9 @@ Example:
 				"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-mi2s.10", "msm-dai-q6-mi2s.11",
 				"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",
@@ -2595,8 +2636,10 @@ Example:
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&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_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -2623,6 +2666,8 @@ Example:
 				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;
 		asoc-cpu-names = "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-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4",
@@ -2802,9 +2847,12 @@ Example:
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
@@ -2836,7 +2884,10 @@ Example:
 		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",
 				"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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
diff --git a/qcom/direwolf-vm-audio.dtsi b/qcom/direwolf-vm-audio.dtsi
index b19586acd6d7..97daaaacacf7 100644
--- a/qcom/direwolf-vm-audio.dtsi
+++ b/qcom/direwolf-vm-audio.dtsi
@@ -1089,9 +1089,12 @@
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -1167,7 +1170,10 @@
 		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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
diff --git a/qcom/holi-audio.dtsi b/qcom/holi-audio.dtsi
index 4014574b45ee..a0c2b9670d42 100644
--- a/qcom/holi-audio.dtsi
+++ b/qcom/holi-audio.dtsi
@@ -153,8 +153,10 @@
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&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_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -181,6 +183,8 @@
 				<&rx_cdc_dma_7_rx>,<&afe_loopback_tx>;
 		asoc-cpu-names = "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-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4",
diff --git a/qcom/lahaina-audio.dtsi b/qcom/lahaina-audio.dtsi
index c891c458f208..8644464838ad 100644
--- a/qcom/lahaina-audio.dtsi
+++ b/qcom/lahaina-audio.dtsi
@@ -112,9 +112,13 @@
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&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_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -149,6 +153,9 @@
 				"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-mi2s.10", "msm-dai-q6-mi2s.11",
 				"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",
diff --git a/qcom/msm-audio-lpass.dtsi b/qcom/msm-audio-lpass.dtsi
index 2b4eb0ef2c15..a8e23ba3eb3d 100644
--- a/qcom/msm-audio-lpass.dtsi
+++ b/qcom/msm-audio-lpass.dtsi
@@ -91,46 +91,76 @@
 
 	msm_dai_mi2s: qcom,msm-dai-mi2s {
 		compatible = "qcom,msm-dai-mi2s";
-		dai_mi2s0: qcom,msm-dai-q6-mi2s-prim {
+		dai_mi2s0_rx: qcom,msm-dai-q6-mi2s-prim-rx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <0>;
-			qcom,msm-mi2s-rx-lines = <3>;
-			qcom,msm-mi2s-tx-lines = <0>;
+			qcom,msm-mi2s-lines = <3>;
 		};
 
-		dai_mi2s1: qcom,msm-dai-q6-mi2s-sec {
+		dai_mi2s0_tx: qcom,msm-dai-q6-mi2s-prim-tx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <1>;
-			qcom,msm-mi2s-rx-lines = <1>;
-			qcom,msm-mi2s-tx-lines = <0>;
+			qcom,msm-mi2s-lines = <0>;
 		};
 
-		dai_mi2s2: qcom,msm-dai-q6-mi2s-tert {
+		dai_mi2s1_rx: qcom,msm-dai-q6-mi2s-sec-rx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <2>;
-			qcom,msm-mi2s-rx-lines = <0>;
-			qcom,msm-mi2s-tx-lines = <3>;
+			qcom,msm-mi2s-lines = <1>;
 		};
 
-		dai_mi2s3: qcom,msm-dai-q6-mi2s-quat {
+		dai_mi2s1_tx: qcom,msm-dai-q6-mi2s-sec-tx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <3>;
-			qcom,msm-mi2s-rx-lines = <1>;
-			qcom,msm-mi2s-tx-lines = <2>;
+			qcom,msm-mi2s-lines = <0>;
 		};
 
-		dai_mi2s4: qcom,msm-dai-q6-mi2s-quin {
+		dai_mi2s2_rx: qcom,msm-dai-q6-mi2s-tert-rx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <4>;
-			qcom,msm-mi2s-rx-lines = <1>;
-			qcom,msm-mi2s-tx-lines = <2>;
+			qcom,msm-mi2s-lines = <0>;
 		};
 
-		dai_mi2s5: qcom,msm-dai-q6-mi2s-senary {
+		dai_mi2s2_tx: qcom,msm-dai-q6-mi2s-tert-tx {
 			compatible = "qcom,msm-dai-q6-mi2s";
 			qcom,msm-dai-q6-mi2s-dev-id = <5>;
-			qcom,msm-mi2s-rx-lines = <0>;
-			qcom,msm-mi2s-tx-lines = <3>;
+			qcom,msm-mi2s-lines = <3>;
+		};
+
+		dai_mi2s3_rx: qcom,msm-dai-q6-mi2s-quat-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <6>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s3_tx: qcom,msm-dai-q6-mi2s-quat-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <7>;
+			qcom,msm-mi2s-lines = <2>;
+		};
+
+		dai_mi2s4_rx: qcom,msm-dai-q6-mi2s-quin-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <8>;
+			qcom,msm-mi2s-lines = <1>;
+		};
+
+		dai_mi2s4_tx: qcom,msm-dai-q6-mi2s-quin-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <9>;
+			qcom,msm-mi2s-lines = <2>;
+		};
+
+		dai_mi2s5_rx: qcom,msm-dai-q6-mi2s-senary-rx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <10>;
+			qcom,msm-mi2s-lines = <0>;
+		};
+
+		dai_mi2s5_tx: qcom,msm-dai-q6-mi2s-senary-tx {
+			compatible = "qcom,msm-dai-q6-mi2s";
+			qcom,msm-dai-q6-mi2s-dev-id = <11>;
+			qcom,msm-mi2s-lines = <3>;
 		};
 	};
 
diff --git a/qcom/sa6155-audio.dtsi b/qcom/sa6155-audio.dtsi
index 8e1aa63d8e9f..dc01de783b2b 100644
--- a/qcom/sa6155-audio.dtsi
+++ b/qcom/sa6155-audio.dtsi
@@ -517,9 +517,12 @@ qcom,msm-dai-q6 {
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -553,9 +556,11 @@ qcom,msm-dai-q6 {
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
diff --git a/qcom/sa8155-audio.dtsi b/qcom/sa8155-audio.dtsi
index e93ab89508e5..fc606616f3ec 100644
--- a/qcom/sa8155-audio.dtsi
+++ b/qcom/sa8155-audio.dtsi
@@ -513,9 +513,12 @@ qcom,msm-dai-q6 {
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -549,9 +552,11 @@ qcom,msm-dai-q6 {
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
diff --git a/qcom/sa8155-vm-audio.dtsi b/qcom/sa8155-vm-audio.dtsi
index 0db1f18be5a0..1b2feda9b10d 100644
--- a/qcom/sa8155-vm-audio.dtsi
+++ b/qcom/sa8155-vm-audio.dtsi
@@ -469,9 +469,12 @@
 				"msm-pcm-dsp-noirq", "msm-pcm-loopback.1",
 				"msm-pcm-dtmf";
 		asoc-cpu = <&dai_hdmi>, <&dai_dp>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_pri_auxpcm>,
+				<&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>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -505,9 +508,11 @@
 				<&dai_quin_tdm_tx_2>, <&dai_quin_tdm_tx_3>,
 				<&dai_quin_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-auxpcm.1",
+				"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-dev.224", "msm-dai-q6-dev.225",
diff --git a/qcom/scuba-audio.dtsi b/qcom/scuba-audio.dtsi
index bd1b4870f5e7..3413dfeaa15a 100644
--- a/qcom/scuba-audio.dtsi
+++ b/qcom/scuba-audio.dtsi
@@ -100,8 +100,10 @@
 				"msm-pcm-afe", "msm-lsm-client",
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
+		asoc-cpu = <&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_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>,
@@ -128,6 +130,8 @@
 				<&afe_loopback_tx>;
 		asoc-cpu-names = "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-auxpcm.1",
 				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
 				"msm-dai-q6-auxpcm.4", "msm-dai-q6-dev.224",
diff --git a/qcom/shima-atp.dtsi b/qcom/shima-atp.dtsi
index 3fc75973a822..f94b6882afa8 100644
--- a/qcom/shima-atp.dtsi
+++ b/qcom/shima-atp.dtsi
@@ -199,8 +199,8 @@
 	};
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/qcom/shima-audio.dtsi b/qcom/shima-audio.dtsi
index 10ee18cc06de..5fd0a1fa60db 100644
--- a/qcom/shima-audio.dtsi
+++ b/qcom/shima-audio.dtsi
@@ -180,9 +180,13 @@
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&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_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -217,6 +221,9 @@
 				"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-mi2s.10", "msm-dai-q6-mi2s.11",
 				"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",
diff --git a/qcom/shima-idp.dtsi b/qcom/shima-idp.dtsi
index 728936ec43b3..0b0623b7f2b3 100644
--- a/qcom/shima-idp.dtsi
+++ b/qcom/shima-idp.dtsi
@@ -223,8 +223,8 @@
 	};
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/qcom/shima-qrd.dtsi b/qcom/shima-qrd.dtsi
index 926f4c272a16..1621cfee40db 100644
--- a/qcom/shima-qrd.dtsi
+++ b/qcom/shima-qrd.dtsi
@@ -467,8 +467,8 @@
 				  <&bolero>;
 };
 
-&dai_mi2s2 {
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s2_tx {
+	qcom,msm-mi2s-lines = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
 			&tert_mi2s_sd0_active>;
diff --git a/qcom/yupik-audio-overlay.dtsi b/qcom/yupik-audio-overlay.dtsi
index c3de58d5aa40..8a69b60a5f3f 100644
--- a/qcom/yupik-audio-overlay.dtsi
+++ b/qcom/yupik-audio-overlay.dtsi
@@ -488,9 +488,12 @@
 	};
 };
 
-&dai_mi2s1 {
-	qcom,msm-mi2s-rx-lines = <0>;
-	qcom,msm-mi2s-tx-lines = <1>;
+&dai_mi2s1_rx {
+	qcom,msm-mi2s-lines = <0>;
+};
+
+&dai_mi2s1_tx {
+	qcom,msm-mi2s-lines = <1>;
 };
 
 &adsp_loader {
diff --git a/qcom/yupik-audio.dtsi b/qcom/yupik-audio.dtsi
index 6800853aaaf6..865416bd4f7e 100644
--- a/qcom/yupik-audio.dtsi
+++ b/qcom/yupik-audio.dtsi
@@ -180,9 +180,13 @@
 				"msm-pcm-routing", "msm-compr-dsp",
 				"msm-pcm-dsp-noirq";
 		asoc-cpu = <&dai_dp>, <&dai_dp1>,
-				<&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
+				<&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_mi2s5_rx>, <&dai_mi2s5_tx>,
+				<&dai_pri_auxpcm>,
 				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
 				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
 				<&dai_sen_auxpcm>,
@@ -217,6 +221,9 @@
 				"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-mi2s.10", "msm-dai-q6-mi2s.11",
 				"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",