From 34a3a449896a8ea89990f8ca7e28c69433aff6e6 Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Fri, 5 Sep 2014 13:27:43 -0700
Subject: [PATCH] msm8976-common: Update audio_platform_info for extended
 format

* XML for everyone!!

Change-Id: Ibf32c987d3360adfd5658befa91a1c5c166b43d4
---
 audio/audio_platform_info_extcodec.xml | 38 ++++++++++++++++++++++++++
 audio/mixer_paths_wcd9330.xml          | 24 ----------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/audio/audio_platform_info_extcodec.xml b/audio/audio_platform_info_extcodec.xml
index 4bfc3a7..4e224cf 100644
--- a/audio/audio_platform_info_extcodec.xml
+++ b/audio/audio_platform_info_extcodec.xml
@@ -59,6 +59,44 @@
         <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="36"/>
         <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="37"/>
     </pcm_ids>
+    <device_names>
+        <!-- Output devices -->
+        <device name="SND_DEVICE_OUT_HEADPHONES" alias="headset" />
+        <device name="SND_DEVICE_OUT_VOICE_HANDSET" alias="voice-call-handset" />
+        <device name="SND_DEVICE_OUT_VOICE_SPEAKER" alias="voice-call-speaker" />
+        <device name="SND_DEVICE_OUT_VOICE_HEADPHONES" alias="voice-call-headset" />
+        <device name="SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES" alias="TTY-full" />
+        <device name="SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES" alias="TTY-headset" />
+        <device name="SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET" alias="TTY-handset" />
+
+        <!-- Input devices -->
+        <device name="SND_DEVICE_IN_HANDSET_MIC" alias="rec-main-mic" />
+        <device name="SND_DEVICE_IN_HANDSET_DMIC" alias="voice-call-main-mic" />
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_NS" alias="voice-call-NS-mic-handset" />
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC" alias="voice-call-main-mic" />
+        <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" alias="voice-call-main-mic" />
+        <device name="SND_DEVICE_IN_SPEAKER_MIC" alias="rec-sub-mic" />
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC" alias="voice-call-sub-mic" />
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_NS" alias="voice-call-NS-mic-speaker" />
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC" alias="voice-call-sub-mic" />
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" alias="voice-call-sub-mic" />
+        <device name="SND_DEVICE_IN_HEADSET_MIC" alias="rec-headset-mic" />
+        <device name="SND_DEVICE_IN_HEADSET_MIC_FLUENCE" alias="rec-main-mic" />
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" alias="voice-call-sub-mic" />
+        <device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" alias="voice-call-headset-mic" />
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" alias="rec-stereo-mic" />
+        <device name="SND_DEVICE_IN_VOICE_DMIC" alias="voice-call-main-mic" />
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" alias="voice-call-sub-mic" />
+        <device name="SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC" alias="TTY-full-mic" />
+        <device name="SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC" alias="TTY-vco-mic" />
+        <device name="SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC" alias="TTY-headset-mic" />
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC" alias="vr-main-mic" />
+        <device name="SND_DEVICE_IN_VOICE_REC_HEADSET_MIC" alias="vr-headset-mic" />
+        <device name="SND_DEVICE_IN_VOICE_REC_MIC_NS" alias="svoice-NS-mic" />
+        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" alias="vr-sub-mic" />
+        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" alias="rec-stereo-mic" />
+        <device name="SND_DEVICE_IN_SPEAKER_STEREO_DMIC" alias="rec-stereo-mic" />
+    </device_names>
     <tz_names>
         <device name="SND_DEVICE_OUT_SPEAKER" spkr_1_tz_name="wsatz.11" spkr_2_tz_name="wsatz.12"/>
     </tz_names>
diff --git a/audio/mixer_paths_wcd9330.xml b/audio/mixer_paths_wcd9330.xml
index efb4311..17403c9 100644
--- a/audio/mixer_paths_wcd9330.xml
+++ b/audio/mixer_paths_wcd9330.xml
@@ -1076,10 +1076,6 @@
             <ctl name="Headphone Playback Volume" value="25"/>
     </path>
 
-    <path name="headphones">
-        <path name="headset" />
-    </path>
-
     <path name="speaker-and-headphones">
         <path name="spk-ear" />
             <ctl name="DAC1 Playback Volume" value="170"/>
@@ -1212,26 +1208,6 @@
             <ctl name="STO1 ADC Capture Volume" value="47"/>
     </path>
 
-    <path name="headset-mic">
-        <path name="rec-headset-mic" />
-    </path>
-
-    <path name="handset-mic">
-        <path name="rec-main-mic" />
-    </path>
-
-    <path name="voice-rec-mic">
-       <path name="rec-main-mic" />
-   </path>
-
-    <path name="voice-rec-dmic-ef">
-        <path name="rec-stereo-mic" />
-    </path>
-
-    <path name="speaker-mic">
-        <path name="rec-main-mic" />
-    </path>
-
     <!-- end of Recording Scenario -->
 
     <!-- ================================================================ -->