commit 4ecf0c629880fa0d6f05e46c33ae72b41fdbcd7d
author Pallavi <pallavim@codeaurora.org> Wed Feb 26 11:58:55 2020 +0530
committer Pallavi <pallavim@codeaurora.org> Wed Feb 26 12:08:20 2020 +0530
tree 5068303aada88551cac547da044d0a8fa932775a
parent 222900b24a6a323de37e25b6282e222dc210e9d8

hal: Add support for voicemmode2 call for hana+sdx55

HAL layer changes for voicemmode2 call for hana+sdx55
sound card.

Change-Id: I9f6a7df458cda4ea5f5ab98e413ffb9d000d8b40

configs/msmnile/mixer_paths_i2s.xml

diff --git a/configs/msmnile/mixer_paths_i2s.xml b/configs/msmnile/mixer_paths_i2s.xml
index 87f93ab..a76805e 100644
--- a/configs/msmnile/mixer_paths_i2s.xml
+++ b/configs/msmnile/mixer_paths_i2s.xml
@@ -1963,8 +1963,14 @@
     </path>
 
     <path name="voicemmode2-call headset">
-        <ctl name="SLIM_6_RX_Voice Mixer VoiceMMode2" value="1" />
-        <ctl name="VoiceMMode2_Tx Mixer SLIM_1_TX_MMode2" value="1" />
+        <ctl name="SLIMBUS6_DL_HL Switch" value="1" />
+        <ctl name="QUAT_MI2S_RX_DL_HL Switch" value="1" />
+        <ctl name="Voice Stub Tx Mixer SLIM_1_TX" value="1" />
+        <ctl name="QUAT_MI2S_RX_Voice Mixer Voice Stub" value="1" />
+        <ctl name="Voice Stub Tx Mixer QUAT_MI2S_TX" value="1" />
+        <ctl name="SLIM_6_RX_Voice Mixer Voice Stub" value="1" />
+        <ctl name="QUAT_MI2S_RX Port Mixer SLIM_1_TX" value="1" />
+        <ctl name="SLIMBUS_6_RX Port Mixer QUAT_MI2S_TX" value="1" />
     </path>
 
     <path name="voicemmode2-call bt-sco">

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 300afe6..7ab2811 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3404,7 +3404,7 @@
         !strncmp("msm8996", platform, sizeof("msm8996")) ||
         !strncmp("sm6150", platform, sizeof("sm6150")) ||
         (!strncmp("msmnile", platform, sizeof("msmnile")) &&
-         !strncmp("hana55", snd_card_name, sizeof("hana55"))) ||
+         !strncmp("sm8150-hana55-snd-card", snd_card_name, sizeof("sm8150-hana55-snd-card"))) ||
         !strncmp("sdx", platform, sizeof("sdx")) ||
         !strncmp("sdm845", platform, sizeof("sdm845"))) &&
         ( !strncmp("mdm", baseband, (sizeof("mdm")-1)) ||

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 1a56ece..56636da 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -621,7 +621,7 @@
 #define VOICEMMODE2_CALL_PCM_DEVICE 22
 #elif PLATFORM_MSMNILE
 #define VOICEMMODE1_CALL_PCM_DEVICE 46
-#define VOICEMMODE2_CALL_PCM_DEVICE 47
+#define VOICEMMODE2_CALL_PCM_DEVICE 46
 #else
 #define VOICEMMODE1_CALL_PCM_DEVICE 44
 #define VOICEMMODE2_CALL_PCM_DEVICE 45