commit c06f6776a5abd25a881dc7947e3cc490e8c28266
author Yung Ti Su <andysu@google.com> Fri Oct 05 15:43:40 2018 +0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 02 23:05:39 2019 -0700
tree f5aac8dc4d0f83b6250609ec505f10be9c91ccae
parent 198adc001c0a8756f41ee28bcccf71f2922fe627

hal: Correct mixer control name for 3.5mm headphone

Bug: 117198646
Test: Self build and test OK.
Change-Id: I749609aabfed53e8adb3575695c248bf9a674874
Signed-off-by: Yung Ti Su <andysu@google.com>
(cherry picked from commit 39a2b8a03c0a8a44940ac732f636d9cc1959eff2)

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index efbd0ae..a6c3ea3 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3361,10 +3361,19 @@
             my_data->current_backend_cfg[DEFAULT_CODEC_TX_BACKEND].samplerate_mixer_ctl =
                 strdup("SLIM_0_TX SampleRate");
         }
-        my_data->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
-            strdup("SLIM_6_RX Format");
-        my_data->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
-            strdup("SLIM_6_RX SampleRate");
+
+        if (strstr(snd_card_name, "intcodec")) {
+            my_data->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("INT0_MI2S_RX Format");
+            my_data->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("INT0_MI2S_RX SampleRate");
+        } else {
+            my_data->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("SLIM_6_RX Format");
+            my_data->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("SLIM_6_RX SampleRate");
+        }
+
         //TODO: enable CONCURRENT_CAPTURE_ENABLED flag only if separate backend is defined
         //for headset-mic. This is to capture separate data from headset-mic and handset-mic.
         if(audio_extn_is_concurrent_capture_enabled())