audio: Add PDM mic enabling flexibility
fix the multi-channel recording creates fail issue
Bug: 181849225
Bug: 174448901
Bug: 176208349
Test: verify by HW Oneal
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: I728ebb2633257583a245c61b559fba4ec726efd4
diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml
index e0bc8fc..696b1da 100644
--- a/audio/oriole/config/mixer_paths.xml
+++ b/audio/oriole/config/mixer_paths.xml
@@ -637,8 +637,8 @@
<!-- Tx device -->
<path name="handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
@@ -647,7 +647,7 @@
<path name="voice-handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
@@ -688,8 +688,8 @@
<path name="voice-recog-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml
index e0bc8fc..696b1da 100644
--- a/audio/raven/config/mixer_paths.xml
+++ b/audio/raven/config/mixer_paths.xml
@@ -637,8 +637,8 @@
<!-- Tx device -->
<path name="handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
@@ -647,7 +647,7 @@
<path name="voice-handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
@@ -688,8 +688,8 @@
<path name="voice-recog-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml
index ea557c9..ee676eb 100644
--- a/audio/whitefin/config/mixer_paths.xml
+++ b/audio/whitefin/config/mixer_paths.xml
@@ -605,6 +605,9 @@
<ctl name="Main AMP Enable Switch" value="1"/>
</path>
+ <path name="voice-hac">
+ <path name="voice-handset"/>
+ </path>
<path name="voice-hac-handset">
</path>
@@ -634,25 +637,21 @@
<!-- Tx device -->
<path name="handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
</path>
<path name="voice-handset-mic">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="1"/>
- <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1"/>
+ <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="-1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
</path>
@@ -663,9 +662,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
</path>
@@ -676,9 +672,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
</path>
@@ -690,9 +683,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="0"/>
</path>
@@ -703,9 +693,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="220"/>
</path>
@@ -716,7 +703,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
</path>
@@ -727,8 +713,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
</path>
@@ -739,9 +723,6 @@
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
<ctl name="MIC Clock Rate" value="3072000"/>
<ctl name="MIC DC Blocker" value="1"/>
- <ctl name="MIC0" value="1"/>
- <ctl name="MIC1" value="1"/>
- <ctl name="MIC2" value="1"/>
<ctl name="MIC HW Gain At High Power Mode (cB)" value="50"/>
</path>
