commit 43606ffaf1c2e21426b820346180c26487613a8e
author Linux Build Service Account <lnxbuild@localhost> Sun Sep 27 23:44:04 2015 -0600
committer Linux Build Service Account <lnxbuild@localhost> Sun Sep 27 23:44:04 2015 -0600
tree 5155b761cfb49516e7be83b744edd3bb871e0af2
parent b859f54c80aeab4769fce79c70fcea82f2c8d1ff
parent df8b6044bbd2a3faa8f64b9a429e6e7dda2be1d7

Merge df8b6044bbd2a3faa8f64b9a429e6e7dda2be1d7 on remote branch

Change-Id: I0cc5d679e252d24975a9994ad7bc309fb8b5006c

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index c0aa2a1..bc1b8ab 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1746,6 +1746,26 @@
     my_data->current_backend_cfg[HEADPHONE_44_1_BACKEND].samplerate_mixer_ctl =
         strdup("SLIM_5_RX SampleRate");
 
+
+    if (platform_get_native_support()) {
+
+        if (!strncmp(snd_card_name, "msm8976-tasha-snd-card",
+            sizeof("msm8976-tasha-snd-card")) ||
+            !strncmp(snd_card_name, "msm8976-tashalite-snd-card",
+            sizeof("msm8976-tashalite-snd-card"))) {
+            /* do nothing */
+        }
+        else {
+            platform_set_native_support(false);
+        }
+    }
+
+    ALOGD("native: native audio: %s for sound card %s",
+        (platform_get_native_support() ? "enabled" : "disabled"),
+        snd_card_name);
+
+
+
     my_data->edid_info = NULL;
     return my_data;
 }
@@ -2021,7 +2041,7 @@
 {
     na_props.platform_na_prop_enabled = na_props.ui_na_prop_enabled
         = codec_support;
-    ALOGD("%s: na_props.platform_na_prop_enabled: %d", __func__,
+    ALOGV("%s: na_props.platform_na_prop_enabled: %d", __func__,
            na_props.platform_na_prop_enabled);
     return 0;
 }
@@ -4741,7 +4761,8 @@
     snd_card_name = mixer_get_name(adev_h->mixer);
     if ((!strcmp(snd_card_name, "msm8952-skum-snd-card")) ||
         (!strcmp(snd_card_name, "msm8952-snd-card")) ||
-        (!strcmp(snd_card_name, "msm8952-snd-card-mtp")))
+        (!strcmp(snd_card_name, "msm8952-snd-card-mtp")) ||
+        (!strcmp(snd_card_name, "msm8976-skun-snd-card")))
         return 1;
     else
         return 0;