Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7 am: 3159968042

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

Change-Id: I1c8f09379c353b512e96d9702c79659e2bc8be2a
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
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