diff options
| author | Kunlei Zhang <quic_kunleiz@quicinc.com> | 2022-06-13 17:36:51 +0800 |
|---|---|---|
| committer | Kunlei Zhang <quic_kunleiz@quicinc.com> | 2022-06-14 15:59:32 +0800 |
| commit | 2d1e4bc25491b7883b0eaf37c54e449487f311d2 (patch) | |
| tree | 3e44436c90dc2698c4d4cd465ece4934d5461771 | |
| parent | 8f494538d093642f4fafd30d1eec92e3b3ce702c (diff) | |
hal: update mixer ctrls for parrot qrd
Update below mixer ctrls for parrot qrd:
1. va-mic-mono
2. va-mic-dmic
3. va-mic-tmic
4. speaker-mic
Change-Id: I5a1ea7c6b82b3e660ab040b9af8f6f636d1a7553
| -rw-r--r-- | configs/parrot/mixer_paths_parrot_qrd.xml | 62 | ||||
| -rw-r--r-- | configs/parrot/mixer_paths_parrot_qrd_sku1.xml | 50 |
2 files changed, 40 insertions, 72 deletions
diff --git a/configs/parrot/mixer_paths_parrot_qrd.xml b/configs/parrot/mixer_paths_parrot_qrd.xml index 967b6489..7b634a4e 100644 --- a/configs/parrot/mixer_paths_parrot_qrd.xml +++ b/configs/parrot/mixer_paths_parrot_qrd.xml @@ -470,11 +470,11 @@ </path> <path name="speaker-mic"> - <path name="amic1" /> + <path name="amic5" /> </path> <path name="speaker-mic-liquid"> - <path name="amic1" /> + <path name="amic5" /> </path> <path name="speaker-mic-sbc"> @@ -736,15 +736,15 @@ </path> <path name="va-mic-mono"> - <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="VA DEC0 MUX" value="SWR_MIC" /> - <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" /> - <ctl name="TX2 MODE" value="ADC_LP" /> - <ctl name="ADC3 MUX" value="INP4" /> - <ctl name="VA SMIC MUX0" value="SWR_MIC8" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> - <ctl name="ADC3_MIXER Switch" value="1" /> - <ctl name="VA_AMIC4_MIXER Switch" value="1" /> + <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="VA DEC2 MUX" value="SWR_MIC" /> + <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" /> + <ctl name="TX1 MODE" value="ADC_LP" /> + <ctl name="ADC2 MUX" value="INP3" /> + <ctl name="VA SMIC MUX2" value="SWR_MIC5" /> + <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" /> + <ctl name="ADC2_MIXER Switch" value="1" /> + <ctl name="VA_AMIC3_MIXER Switch" value="1" /> </path> <path name="va-mic-dmic"> @@ -756,16 +756,15 @@ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" /> <ctl name="TX2 MODE" value="ADC_LP" /> <ctl name="TX1 MODE" value="ADC_LP" /> - <ctl name="ADC3 MUX" value="INP4" /> <ctl name="ADC2 MUX" value="INP3" /> - <ctl name="VA SMIC MUX0" value="SWR_MIC8" /> - <ctl name="VA SMIC MUX1" value="SWR_MIC5" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> + <ctl name="VA SMIC MUX0" value="SWR_MIC5" /> + <ctl name="VA SMIC MUX1" value="SWR_MIC4" /> <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" /> - <ctl name="ADC3_MIXER Switch" value="1" /> + <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" /> <ctl name="ADC2_MIXER Switch" value="1" /> - <ctl name="VA_AMIC4_MIXER Switch" value="1" /> + <ctl name="ADC1_MIXER Switch" value="1" /> <ctl name="VA_AMIC3_MIXER Switch" value="1" /> + <ctl name="VA_AMIC1_MIXER Switch" value="1" /> </path> <path name="va-mic-tmic"> @@ -778,24 +777,24 @@ <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" /> <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" /> <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" /> - <ctl name="VA SMIC MUX0" value="SWR_MIC4" /> + <ctl name="VA SMIC MUX0" value="SWR_MIC5" /> <ctl name="VA SMIC MUX1" value="SWR_MIC8" /> - <ctl name="VA SMIC MUX2" value="SWR_MIC5" /> + <ctl name="VA SMIC MUX2" value="SWR_MIC4" /> <ctl name="TX0 MODE" value="ADC_LP" /> <ctl name="TX1 MODE" value="ADC_LP" /> <ctl name="TX2 MODE" value="ADC_LP" /> <ctl name="ADC2_BCS Disable" value="1" /> <ctl name="ADC2 MUX" value="INP3" /> - <ctl name="ADC3 MUX" value="INP4" /> + <ctl name="ADC4 MUX" value="INP5" /> <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" /> <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> + <ctl name="ADC4 ChMap" value="SWRM_TX3_CH1" /> <ctl name="ADC1_MIXER Switch" value="1" /> <ctl name="ADC2_MIXER Switch" value="1" /> - <ctl name="ADC3_MIXER Switch" value="1" /> + <ctl name="ADC4_MIXER Switch" value="1" /> <ctl name="VA_AMIC1_MIXER Switch" value="1" /> <ctl name="VA_AMIC3_MIXER Switch" value="1" /> - <ctl name="VA_AMIC4_MIXER Switch" value="1" /> + <ctl name="VA_AMIC5_MIXER Switch" value="1" /> </path> <path name="va-mic"> @@ -958,22 +957,7 @@ </path> <path name="speaker-dmic-broadside"> - <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> - <ctl name="TX DEC1 MUX" value="SWR_MIC" /> - <ctl name="TX DEC2 MUX" value="SWR_MIC" /> - <ctl name="TX SMIC MUX1" value="SWR_MIC8" /> - <ctl name="TX SMIC MUX2" value="SWR_MIC4" /> - <ctl name="ADC3 MUX" value="INP4" /> - <ctl name="HDR34 MUX" value="NO_HDR34" /> - <ctl name="TX2 MODE" value="ADC_LP" /> - <ctl name="TX0 MODE" value="ADC_LP" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> - <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" /> - <ctl name="ADC3_MIXER Switch" value="1" /> - <ctl name="ADC1_MIXER Switch" value="1" /> - <ctl name="AMIC4_MIXER Switch" value="1" /> - <ctl name="AMIC1_MIXER Switch" value="1" /> + <path name="speaker-dmic-endfire" /> </path> <path name="dmic-broadside"> diff --git a/configs/parrot/mixer_paths_parrot_qrd_sku1.xml b/configs/parrot/mixer_paths_parrot_qrd_sku1.xml index f65ac42b..3ad3707a 100644 --- a/configs/parrot/mixer_paths_parrot_qrd_sku1.xml +++ b/configs/parrot/mixer_paths_parrot_qrd_sku1.xml @@ -473,11 +473,11 @@ </path> <path name="speaker-mic"> - <path name="amic1" /> + <path name="amic5" /> </path> <path name="speaker-mic-liquid"> - <path name="amic1" /> + <path name="amic5" /> </path> <path name="speaker-mic-sbc"> @@ -739,15 +739,15 @@ </path> <path name="va-mic-mono"> - <ctl name="VA_AIF1_CAP Mixer DEC0" value="1" /> - <ctl name="VA DEC0 MUX" value="SWR_MIC" /> - <ctl name="VA_DEC0 MODE" value="ADC_LOW_PWR" /> - <ctl name="TX2 MODE" value="ADC_LP" /> - <ctl name="ADC3 MUX" value="INP4" /> - <ctl name="VA SMIC MUX0" value="SWR_MIC8" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> - <ctl name="ADC3_MIXER Switch" value="1" /> - <ctl name="VA_AMIC4_MIXER Switch" value="1" /> + <ctl name="VA_AIF1_CAP Mixer DEC2" value="1" /> + <ctl name="VA DEC2 MUX" value="SWR_MIC" /> + <ctl name="VA_DEC2 MODE" value="ADC_LOW_PWR" /> + <ctl name="TX1 MODE" value="ADC_LP" /> + <ctl name="ADC2 MUX" value="INP3" /> + <ctl name="VA SMIC MUX2" value="SWR_MIC5" /> + <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" /> + <ctl name="ADC2_MIXER Switch" value="1" /> + <ctl name="VA_AMIC3_MIXER Switch" value="1" /> </path> <path name="va-mic-dmic"> @@ -759,16 +759,15 @@ <ctl name="VA_DEC1 MODE" value="ADC_LOW_PWR" /> <ctl name="TX2 MODE" value="ADC_LP" /> <ctl name="TX1 MODE" value="ADC_LP" /> - <ctl name="ADC3 MUX" value="INP4" /> <ctl name="ADC2 MUX" value="INP3" /> - <ctl name="VA SMIC MUX0" value="SWR_MIC8" /> - <ctl name="VA SMIC MUX1" value="SWR_MIC5" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> + <ctl name="VA SMIC MUX0" value="SWR_MIC5" /> + <ctl name="VA SMIC MUX1" value="SWR_MIC4" /> <ctl name="ADC2 ChMap" value="SWRM_TX2_CH2" /> - <ctl name="ADC3_MIXER Switch" value="1" /> + <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" /> <ctl name="ADC2_MIXER Switch" value="1" /> - <ctl name="VA_AMIC4_MIXER Switch" value="1" /> + <ctl name="ADC1_MIXER Switch" value="1" /> <ctl name="VA_AMIC3_MIXER Switch" value="1" /> + <ctl name="VA_AMIC1_MIXER Switch" value="1" /> </path> <path name="va-mic-tmic"> @@ -961,22 +960,7 @@ </path> <path name="speaker-dmic-broadside"> - <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" /> - <ctl name="TX_AIF1_CAP Mixer DEC2" value="1" /> - <ctl name="TX DEC1 MUX" value="SWR_MIC" /> - <ctl name="TX DEC2 MUX" value="SWR_MIC" /> - <ctl name="TX SMIC MUX1" value="SWR_MIC8" /> - <ctl name="TX SMIC MUX2" value="SWR_MIC4" /> - <ctl name="ADC3 MUX" value="INP4" /> - <ctl name="HDR34 MUX" value="NO_HDR34" /> - <ctl name="TX2 MODE" value="ADC_LP" /> - <ctl name="TX0 MODE" value="ADC_LP" /> - <ctl name="ADC3 ChMap" value="SWRM_TX3_CH1" /> - <ctl name="ADC1 ChMap" value="SWRM_TX2_CH1" /> - <ctl name="ADC3_MIXER Switch" value="1" /> - <ctl name="ADC1_MIXER Switch" value="1" /> - <ctl name="AMIC4_MIXER Switch" value="1" /> - <ctl name="AMIC1_MIXER Switch" value="1" /> + <path name="speaker-dmic-endfire" /> </path> <path name="dmic-broadside"> |