commit 39d48df771ce7b8eb1f8bef0f4cb9621e507037d
author Yung Ti Su <andysu@google.com> Thu Oct 18 01:10:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 18 01:10:27 2018 -0700
tree 4c988340da86e708a4eb0ab97f692daa65c6d6c6
parent 42da8213e8f1a209595ac42a2184df1fee5957e2
parent 39a2b8a03c0a8a44940ac732f636d9cc1959eff2

hal: Correct mixer control name for 3.5mm headphone
am: 39a2b8a03c

Change-Id: Ie832e3d1d740979611815f75c91e4fe8e9083eb0

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 87aba23..7563689 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -1437,10 +1437,17 @@
     pdata->current_backend_cfg[USB_AUDIO_TX_BACKEND].channels_mixer_ctl =
             strdup("USB_AUDIO_TX Channels");
 
-    pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
-            strdup("SLIM_6_RX Format");
-    pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
-            strdup("SLIM_6_RX SampleRate");
+    if (strstr(pdata->snd_card_name, "intcodec")) {
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("INT0_MI2S_RX Format");
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("INT0_MI2S_RX SampleRate");
+    } else {
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].bitwidth_mixer_ctl =
+                strdup("SLIM_6_RX Format");
+        pdata->current_backend_cfg[HEADPHONE_BACKEND].samplerate_mixer_ctl =
+                strdup("SLIM_6_RX SampleRate");
+    }
 
     pdata->current_backend_cfg[USB_AUDIO_RX_BACKEND].bitwidth_mixer_ctl =
             strdup("USB_AUDIO_RX Format");