commit 409dd56a15d092f15092de1452677f738c086621
author Uday Kishore Pasupuleti <upasupul@codeaurora.org> Tue Jul 07 19:07:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 07 19:07:05 2015 +0000
tree 99570dcc3af0398ea0054d29f4aed8169942270a
parent 5ffa83a563efc189e37c8d7eb0e23d93a1a2ab4b
parent 11dd22384f2ae13ec4a7563ce5f0a113cf30a53c

am 11dd2238: hal: fix to load wcd9330 mixer path file

* commit '11dd22384f2ae13ec4a7563ce5f0a113cf30a53c':
  hal: fix to load wcd9330 mixer path file

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 0d68394..a8005db 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -30,6 +30,7 @@
 #include <linux/msm_audio.h>
 
 #define MIXER_XML_PATH "/system/etc/mixer_paths.xml"
+#define MIXER_XML_PATH_WCD9330 "/system/etc/mixer_paths_wcd9330.xml"
 #define LIB_ACDB_LOADER "libacdbloader.so"
 #define AUDIO_DATA_BLOCK_MIXER_CTL "HDMI EDID"
 #define CVD_VERSION_MIXER_CTL "CVD Version"
@@ -824,7 +825,15 @@
 
         ALOGD("%s: snd_card_name: %s", __func__, snd_card_name);
 
-        adev->audio_route = audio_route_init(snd_card_num, MIXER_XML_PATH);
+        if (!strncmp(snd_card_name, "msm8226-tomtom-snd-card",
+                     sizeof("msm8226-tomtom-snd-card"))) {
+            ALOGD("%s: Call MIXER_XML_PATH_WCD9330", __func__);
+            adev->audio_route = audio_route_init(snd_card_num,
+                                                 MIXER_XML_PATH_WCD9330);
+        } else {
+            adev->audio_route = audio_route_init(snd_card_num, MIXER_XML_PATH);
+        }
+
         if (!adev->audio_route) {
             ALOGE("%s: Failed to init audio route controls, aborting.", __func__);
             goto init_failed;