asoc: bengal: Fix MI2S/TDM LPAIF_WSA BE mapping

Update the HLOS to ADSP I2S name mapping
for MI2S/TDM Secondary interface for bengal target.

Change-Id: I0d5c694c61441fc825b6002d1a455b3c1e64ac00
Signed-off-by: Subhadra Jagadeesan <quic_subhjaga@quicinc.com>

asoc/msm-audio-defs.h

@@ -30,18 +30,23 @@
 #ifdef CONFIG_MI2S_BOLERO_V2_1
 #define LPASS_BE_PRI_MI2S_RX "MI2S-LPAIF_VA-RX-PRIMARY"
 #define LPASS_BE_PRI_MI2S_TX "MI2S-LPAIF_VA-TX-PRIMARY"
-#define LPASS_BE_SEC_MI2S_RX "MI2S-LPAIF_WSA-RX-SECONDARY"
-#define LPASS_BE_SEC_MI2S_TX "MI2S-LPAIF_WSA-TX-SECONDARY"
+#define LPASS_BE_SEC_MI2S_RX "MI2S-LPAIF_WSA-RX-PRIMARY"
+#define LPASS_BE_SEC_MI2S_TX "MI2S-LPAIF_WSA-TX-PRIMARY"
+#define LPASS_BE_TERT_MI2S_RX "MI2S-LPAIF_WSA-RX-SECONDARY"
+#define LPASS_BE_TERT_MI2S_TX "MI2S-LPAIF_WSA-TX-SECONDARY"
 #else
 #define LPASS_BE_PRI_MI2S_RX "MI2S-LPAIF-RX-PRIMARY"
 #define LPASS_BE_PRI_MI2S_TX "MI2S-LPAIF-TX-PRIMARY"
 #define LPASS_BE_SEC_MI2S_RX "MI2S-LPAIF-RX-SECONDARY"
 #define LPASS_BE_SEC_MI2S_TX "MI2S-LPAIF-TX-SECONDARY"
-#endif
+#define LPASS_BE_SEN_MI2S_RX "MI2S-LPAIF_WSA-RX-PRIMARY"
+#define LPASS_BE_SEN_MI2S_TX "MI2S-LPAIF_WSA-TX-PRIMARY"
 #define LPASS_BE_TERT_MI2S_RX "MI2S-LPAIF-RX-TERTIARY"
 #define LPASS_BE_TERT_MI2S_TX "MI2S-LPAIF-TX-TERTIARY"
+#endif
 #define LPASS_BE_QUAT_MI2S_RX "MI2S-LPAIF_RXTX-RX-PRIMARY"
 #define LPASS_BE_QUAT_MI2S_TX "MI2S-LPAIF_RXTX-TX-PRIMARY"
+
 #ifndef CONFIG_MI2S_BOLERO_V2_1
 #define LPASS_BE_QUIN_MI2S_RX "MI2S-LPAIF_VA-RX-PRIMARY"
 #define LPASS_BE_QUIN_MI2S_TX "MI2S-LPAIF_VA-TX-PRIMARY"
@@ -49,8 +54,6 @@
 #define LPASS_BE_QUIN_MI2S_RX "MI2S-LPAIF-RX-QUIN"
 #define LPASS_BE_QUIN_MI2S_TX "MI2S-LPAIF-TX-QUIN"
 #endif
-#define LPASS_BE_SEN_MI2S_RX "MI2S-LPAIF_WSA-RX-PRIMARY"
-#define LPASS_BE_SEN_MI2S_TX "MI2S-LPAIF_WSA-TX-PRIMARY"
 #define LPASS_BE_SEP_MI2S_RX "MI2S-LPAIF_AUD-RX-PRIMARY"
 #define LPASS_BE_SEP_MI2S_TX "MI2S-LPAIF_AUD-TX-PRIMARY"
 
@@ -75,16 +78,20 @@
 #ifdef CONFIG_MI2S_BOLERO_V2_1
 #define LPASS_BE_PRI_TDM_RX_0 "TDM-LPAIF_VA-RX-PRIMARY"
 #define LPASS_BE_PRI_TDM_TX_0 "TDM-LPAIF_VA-TX-PRIMARY"
+#define LPASS_BE_SEC_TDM_RX_0 "TDM-LPAIF_WSA-RX-PRIMARY"
+#define LPASS_BE_SEC_TDM_TX_0 "TDM-LPAIF_WSA-TX-PRIMARY"
+#define LPASS_BE_TERT_TDM_RX_0 "TDM-LPAIF_WSA-RX-SECONDARY"
+#define LPASS_BE_TERT_TDM_TX_0 "TDM-LPAIF_WSA-TX-SECONDARY"
 #else
 #define LPASS_BE_PRI_TDM_RX_0 "TDM-LPAIF-RX-PRIMARY"
 #define LPASS_BE_PRI_TDM_TX_0 "TDM-LPAIF-TX-PRIMARY"
-#endif
 #define LPASS_BE_SEC_TDM_RX_0 "TDM-LPAIF-RX-SECONDARY"
 #define LPASS_BE_SEC_TDM_TX_0 "TDM-LPAIF-TX-SECONDARY"
-#define LPASS_BE_TERT_TDM_RX_0 "TDM-LPAIF-RX-TERTIARY"
-#define LPASS_BE_TERT_TDM_TX_0 "TDM-LPAIF-TX-TERTIARY"
 #define LPASS_BE_SEN_TDM_RX_0 "TDM-LPAIF_WSA-RX-PRIMARY"
 #define LPASS_BE_SEN_TDM_TX_0 "TDM-LPAIF_WSA-TX-PRIMARY"
+#define LPASS_BE_TERT_TDM_RX_0 "TDM-LPAIF-RX-TERTIARY"
+#define LPASS_BE_TERT_TDM_TX_0 "TDM-LPAIF-TX-TERTIARY"
+#endif
 #define LPASS_BE_QUAT_TDM_RX_0 "TDM-LPAIF_RXTX-RX-PRIMARY"
 #define LPASS_BE_QUAT_TDM_TX_0 "TDM-LPAIF_RXTX-TX-PRIMARY"
 #define LPASS_BE_QUIN_TDM_RX_0 "TDM-LPAIF_VA-RX-PRIMARY"

asoc/msm_common.c

 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/gpio.h>
@@ -256,8 +256,10 @@ static int get_mi2s_tdm_auxpcm_intf_index(const char *stream_name)
 		return QUAT_MI2S_TDM_AUXPCM;
 	else if (strnstr(stream_name, "LPAIF_WSA", strlen(stream_name))) {
 #ifdef CONFIG_MI2S_BOLERO_V2_1
-		if (strnstr(stream_name, "SECONDARY", strlen(stream_name)))
+		if (strnstr(stream_name, "PRIMARY", strlen(stream_name)))
 			return SEC_MI2S_TDM_AUXPCM;
+		if (strnstr(stream_name, "SECONDARY", strlen(stream_name)))
+			return TER_MI2S_TDM_AUXPCM;
 #else
 		return SEN_MI2S_TDM_AUXPCM;
 #endif