commit 84252c0e78c7f015ec964d4cebd29fb55cff0f77
author Alistair Delva <adelva@google.com> Mon Jun 15 22:44:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 15 22:44:42 2020 +0000
tree 02746697f1cadd66982f1ca51a2cce138c04bb01
parent 0c3422b29b55ea86b85f689dc152b11118efcb22
parent f43efbef1e20a7765236d33d7f122deb8f497217

Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7 am: 3159968042 am: f7a1f499df am: a37257e85d am: f43efbef1e

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1324657

Change-Id: I0e33268d0cd0bed91aab3abcd2ce459a0859b6ca

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 13eb468..805e2cd 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -40,7 +40,7 @@
 #include <tinyalsa/asoundlib.h>
 
 #define PCM_CARD 0
-#define PCM_DEVICE 1
+#define PCM_DEVICE 0
 
 
 #define OUT_PERIOD_MS 15

qcom/init.qcom.rc

diff --git a/qcom/init.qcom.rc b/qcom/init.qcom.rc
index 4319569..ba4f24c 100644
--- a/qcom/init.qcom.rc
+++ b/qcom/init.qcom.rc
@@ -23,6 +23,7 @@
     start pd_mapper
     exec - root -- /system/bin/sleep 1
     exec - system audio -- /system/bin/tinymix "QUAT_MI2S_RX Audio Mixer MultiMedia1" 1
+    exec - system audio -- /system/bin/tinymix "QUAT_MI2S_RX Audio Mixer MultiMedia2" 1
     exec - system audio -- /system/bin/tinymix "SLIM RX0 MUX" AIF1_PB
     exec - system audio -- /system/bin/tinymix "SLIM RX0 MUX" ZERO
     exec - system audio -- /system/bin/tinymix "SLIM RX1 MUX" ZERO