Merge "audio: add back 5514 switch control for micbias use" into qt-qpr1-dev

This commit is contained in:
TreeHugger Robot
2020-01-20 07:54:52 +00:00
committed by Android (Google) Code Review

View File

@@ -466,10 +466,10 @@
<ctl name="MultiMedia16 Mixer USB_AUDIO_TX" value="0" />
<!-- ALC5513 config -->
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto1 ADC MIXR DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXR DMIC Switch" value="1" />
<ctl name="Sto1 ADC MIXL DMIC Switch" value="0" />
<ctl name="Sto1 ADC MIXR DMIC Switch" value="0" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="0" />
<ctl name="Sto2 ADC MIXR DMIC Switch" value="0" />
<ctl name="Stereo1 DMIC Mux" value="DMIC1" />
<ctl name="Stereo2 DMIC Mux" value="DMIC2" />
<ctl name="ADC1 Capture Volume" id="0" value="23"/>
@@ -1768,6 +1768,8 @@
<ctl name="ADC1 Capture Volume" id="0" value="47"/>
<ctl name="ADC2 Capture Volume" id="0" value="47"/>
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
</path>
<path name="handset">
@@ -1873,24 +1875,28 @@
<path name="handset-mic">
<ctl name="ADC1 Capture Volume" id="0" value="23"/>
<ctl name="PRI_TDM_TX_0 Channels" value="One"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Stereo1 DMIC Mux" value="DMIC1" />
</path>
<path name="1st-mic-only">
<ctl name="PRI TDM TX Channel Offset" id="0" value="0" />
<ctl name="ADC1 Capture Volume" id="0" value="60"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="MultiMedia1 Mixer PRI_TDM_TX_0" value="1" />
</path>
<path name="2nd-mic-only">
<ctl name="PRI TDM TX Channel Offset" id="0" value="8" />
<ctl name="ADC2 Capture Volume" id="0" value="60"/>
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="MultiMedia1 Mixer PRI_TDM_TX_0" value="1" />
</path>
<path name="3rd-mic-only">
<ctl name="PRI TDM TX Channel Offset" id="0" value="12" />
<ctl name="ADC2 Capture Volume" id="1" value="60"/>
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="MultiMedia1 Mixer PRI_TDM_TX_0" value="1" />
</path>
@@ -2068,6 +2074,8 @@
<ctl name="PRI TDM TX Channel Offset" id="1" value="0" />
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="PRI_TDM_TX_0 Format" value="S24_LE" />
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="Stereo1 DMIC Mux" value="DMIC1" />
<ctl name="Stereo2 DMIC Mux" value="DMIC2" />
</path>
@@ -2101,6 +2109,8 @@
<ctl name="ADC1 Capture Volume" id="0" value="50"/>
<ctl name="ADC2 Capture Volume" id="0" value="50"/>
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
</path>
<path name="speaker-dmic-endfire">
@@ -2110,6 +2120,9 @@
<ctl name="PRI TDM TX Channel Offset" id="1" value="0" />
<ctl name="PRI TDM TX Channel Offset" id="2" value="12" />
<ctl name="PRI_TDM_TX_0 Channels" value="Two"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXR DMIC Switch" value="0" />
</path>
<path name="dmic-endfire-liquid">
@@ -2192,6 +2205,9 @@
<!-- Tri MIC devices -->
<path name="three-mic">
<ctl name="PRI_TDM_TX_0 Channels" value="Three"/>
<ctl name="Sto1 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXL DMIC Switch" value="1" />
<ctl name="Sto2 ADC MIXR DMIC Switch" value="1" />
</path>
<path name="speaker-tmic">