commit fd7bfa1fa7e894acae9fdad0acd4591835d4c594
author Alistair Delva <adelva@google.com> Mon Jun 15 21:29:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 15 21:29:01 2020 +0000
tree ef2e1d505c933d8efc2721f408eac6c9bbf633e9
parent 66a926c714312da505cefa7a2856eae9f391ea67
parent 27273a018cf2a8353e6e5d678387d2b02a9fa92c

Merge changes I44fdecfb,I1f2081e4

* changes:
  db845c: Revert "audio: Set analog port as default audio out"
  db845c: audio: Fix HDMI mixer control

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