commit 7294f5224b9ed1d9e631e718c7d08fc67544eb7d
author Laxminath Kasam <lkasam@codeaurora.org> Wed Dec 11 05:07:00 2013 +0530
committer Laxminath Kasam <lkasam@codeaurora.org> Wed Dec 11 08:56:41 2013 +0530
tree e9df54ec9e9ee0d90abc326c095f4644cd5ea1f4
parent ddad86113caf1cd7d50ac6b0a7cbcbc9992ea457

audio: hal: Fix to use correct EC_REF_RX

In 8610, we need to use I2S_RX as ec_ref_rx
parameter and for SLIM based targets use
SLIM_RX.

CRs-Fixed: 575647
Change-Id: Ia220498f302a58dc3dbd42b1874fa01f081ce3dd

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index dfc8ff7..d88fb10 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -992,7 +992,7 @@
             } else if (my_data->fluence_type == FLUENCE_NONE ||
                 my_data->fluence_in_voice_call == false) {
                 snd_device = SND_DEVICE_IN_HANDSET_MIC;
-                set_echo_reference(adev->mixer, "SLIM_RX");
+                set_echo_reference(adev->mixer, EC_REF_RX);
             } else {
                 snd_device = SND_DEVICE_IN_VOICE_DMIC;
                 adev->acdb_settings |= DMIC_FLAG;
@@ -1061,7 +1061,7 @@
                 } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
                     snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
                 }
-                set_echo_reference(adev->mixer, "SLIM_RX");
+                set_echo_reference(adev->mixer, EC_REF_RX);
             } else if (adev->active_input->enable_aec) {
                 if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
                     if (my_data->fluence_type & FLUENCE_DUAL_MIC) {
@@ -1078,7 +1078,7 @@
                 } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {
                     snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;
                 }
-                set_echo_reference(adev->mixer, "SLIM_RX");
+                set_echo_reference(adev->mixer, EC_REF_RX);
             } else if (adev->active_input->enable_ns) {
                 if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {
                     if (my_data->fluence_type & FLUENCE_DUAL_MIC) {

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 8518c7d..8356cab 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -183,8 +183,10 @@
 
 #ifdef PLATFORM_MSM8610
 #define LOWLATENCY_PCM_DEVICE 12
+#define EC_REF_RX "I2S_RX"
 #else
 #define LOWLATENCY_PCM_DEVICE 15
+#define EC_REF_RX "SLIM_RX"
 #endif
 #ifdef PLATFORM_MSM8x26
 #define COMPRESS_CAPTURE_DEVICE 20