dior: Use adc3 for speaker-mic and stereo dmic in camcorder

Change-Id: I9bdf64b21d7454713bc70f36ab4dbc1a0b1ac557

3 files changed, 56 insertions, 17 deletions

diff --git a/configs/audio_platform_info.xml b/configs/audio_platform_info.xml
new file mode 100644
index 0000000..a5162fd
--- /dev/null
+++ b/configs/audio_platform_info.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (C) 2017 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<audio_platform_info>
+    <acdb_ids>
+        <!-- Input devices -->
+        <device name="SND_DEVICE_IN_SPEAKER_DMIC" acdb_id="35" />
+        <device name="SND_DEVICE_IN_VOICE_SPEAKER_DMIC" acdb_id="35" />
+        <device name="SND_DEVICE_IN_CAMCORDER_MIC" acdb_id="35" />
+        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_STEREO" acdb_id="35" />
+        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" acdb_id="35" />
+    </acdb_ids>
+
+    <backend_names>
+        <!-- empty -->
+    </backend_names>
+
+    <pcm_ids>
+        <!-- empty -->
+    </pcm_ids>
+
+    <device_names>
+        <!-- empty -->
+    </device_names>
+</audio_platform_info>
diff --git a/configs/mixer_paths.xml b/configs/mixer_paths.xml
index 441ce87..5a90a13 100644
--- a/configs/mixer_paths.xml
+++ b/configs/mixer_paths.xml
@@ -656,6 +656,14 @@
         <ctl name="IIR1 INP1 MUX" value="DEC1" />
     </path>
 
+    <path name="adc3">
+        <ctl name="AIF1_CAP Mixer SLIM TX1" value="1"/>
+        <ctl name="SLIM_0_TX Channels" value="One" />
+        <ctl name="SLIM TX1 MUX" value="DEC2" />
+        <ctl name="DEC2 MUX" value="ADC3" />
+        <ctl name="IIR1 INP1 MUX" value="DEC2" />
+    </path>
+
     <path name="speaker">
         <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
         <ctl name="SLIM_0_RX Channels" value="One" />
@@ -673,8 +681,8 @@
     </path>
 
     <path name="speaker-mic">
-        <path name="adc1" />
-        <ctl name="ADC1 Volume" value="13" />
+        <path name="adc3" />
+        <ctl name="ADC3 Volume" value="13" />
     </path>
 
     <path name="handset">
@@ -727,8 +735,8 @@
     </path>
 
     <path name="voice-speaker-mic">
-        <path name="adc1" />
-        <ctl name="ADC1 Volume" value="11" />
+        <path name="adc3" />
+        <ctl name="ADC3 Volume" value="11" />
     </path>
 
     <path name="voice-headphones">
@@ -785,19 +793,6 @@
         <path name="handset-mic" />
     </path>
 
-    <path name="camcorder-mic">
-        <ctl name="AIF1_CAP Mixer SLIM TX1" value="1" />
-        <ctl name="AIF1_CAP Mixer SLIM TX2" value="1" />
-        <ctl name="SLIM TX1 MUX" value="DEC1" />
-        <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="SLIM TX2 MUX" value="DEC2" />
-        <ctl name="DEC2 MUX" value="ADC3" />
-        <ctl name="SLIM_0_TX Channels" value="Two" />
-        <ctl name="IIR1 INP1 MUX" value="DEC1" />
-        <ctl name="ADC1 Volume" value="17" />
-        <ctl name="ADC3 Volume" value="17" />
-    </path>
-
     <path name="hdmi-tx">
         <path name="handset-mic" />
     </path>
@@ -868,6 +863,12 @@
         <path name="speaker-dmic-endfire" />
     </path>
 
+    <path name="camcorder-mic">
+        <path name="speaker-dmic-endfire" />
+        <ctl name="ADC1 Volume" value="17" />
+        <ctl name="ADC3 Volume" value="17" />
+    </path>
+
     <!-- TTY devices -->
 
     <path name="tty-headphones-lite">
diff --git a/device.mk b/device.mk
index 19865b9..3e85533 100644
--- a/device.mk
+++ b/device.mk
@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
     tinymix
 
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/audio_platform_info.xml:system/etc/audio_platform_info.xml \
     $(LOCAL_PATH)/configs/audio_effects.conf:system/vendor/etc/audio_effects.conf \
     $(LOCAL_PATH)/configs/audio_policy.conf:system/etc/audio_policy.conf \
     $(LOCAL_PATH)/configs/mixer_paths.xml:system/etc/mixer_paths.xml