Revert "gta4xl-common: Use bargein_samsung_engine-mic settings for main-mic"
This reverts commit d423e47af67a6847334629392b1e98765b40a42d.
Reason for revert: Not needed and wasn't even done correctly
Change-Id: I8adfb62bcc261b5d4e4e0b706b136ba7e643e4b9
diff --git a/configs/audio/mixer_paths.xml b/configs/audio/mixer_paths.xml
index 1d745f7..ca13636 100644
--- a/configs/audio/mixer_paths.xml
+++ b/configs/audio/mixer_paths.xml
@@ -436,6 +436,18 @@
<path name="dev-fm_radio-input">
</path>
+ <path name="dev-main-mic">
+ <ctl name="RECMIX1L BST3 Switch" value="1"/>
+ <ctl name="RECMIX1R BST3 Switch" value="1"/>
+ <ctl name="Stereo1 ADC L Mux" value="ADC1 L"/>
+ <ctl name="Stereo1 ADC R Mux" value="ADC1 R"/>
+ <ctl name="Stereo1 ADC L1 Mux" value="ADC"/>
+ <ctl name="Stereo1 ADC R1 Mux" value="ADC"/>
+ <ctl name="Stereo1 ADC MIXL ADC1 Switch" value="1"/>
+ <ctl name="Stereo1 ADC MIXR ADC1 Switch" value="1"/>
+ <ctl name="Main Mic Switch" value="1" />
+ </path>
+
<path name="dev-2nd-mic">
<ctl name="RECMIX1L BST4 Switch" value="1"/>
<ctl name="RECMIX1R BST4 Switch" value="1"/>
@@ -476,14 +488,6 @@
<ctl name="Sub Mic Switch" value="1" />
</path>
- <path name="dev-main-mic">
- <path name="route-ap-record" />
- <path name="dev-dual-invert-mic" />
- <ctl name="ABOX OEM AP Call BW" value="0x020201" />
- <ctl name="ABOX OEM Bargein type" value="2" />
- <ctl name="ABOX OEM FM Mode" value="2" />
- </path>
-
<path name="dev-headset-mic">
<ctl name="RECMIX1L BST1 Switch" value="1"/>
<ctl name="RECMIX1R BST1 Switch" value="1"/>
@@ -3683,9 +3687,8 @@
<!-- Input stage volume -->
<!-- media input volume -->
<path name="gain-media-mic">
- <ctl name="IN3 Boost Volume" value="41"/>
- <ctl name="IN4 Boost Volume" value="41"/>
- <ctl name="STO1 ADC Capture Volume" value="47 47"/>
+ <ctl name="IN3 Boost Volume" value="34"/>
+ <ctl name="STO1 ADC Capture Volume" value="38 38"/>
</path>
<path name="gain-media-2nd-mic">
@@ -3836,7 +3839,8 @@
<!-- recognition input volume -->
<path name="gain-recognition-mic">
- <path name="gain-media-mic" />
+ <ctl name="IN3 Boost Volume" value="53"/>
+ <ctl name="STO1 ADC Capture Volume" value="47 47"/>
</path>
<path name="gain-recognition-2nd-mic">
diff --git a/configs/audio/mixer_paths_cs47l15.xml b/configs/audio/mixer_paths_cs47l15.xml
index 6016961..7b7d767 100644
--- a/configs/audio/mixer_paths_cs47l15.xml
+++ b/configs/audio/mixer_paths_cs47l15.xml
@@ -397,6 +397,13 @@
<path name="dev-fm_radio-input">
</path>
+ <path name="dev-main-mic">
+ <ctl name="IN1R Mux" value="A" />
+ <ctl name="IN1R HPF Switch" value="1" />
+ <ctl name="AIF1TX1 Input 1" value="IN1L" />
+ <ctl name="AIF1TX2 Input 1" value="IN1L" />
+ </path>
+
<path name="dev-2nd-mic">
<ctl name="IN1L Mux" value="A" />
<ctl name="IN1L HPF Switch" value="1" />
@@ -420,14 +427,6 @@
<ctl name="AIF1TX2 Input 1" value="IN1L" />
</path>
- <path name="dev-main-mic">
- <path name="route-ap-record" />
- <path name="dev-dual-invert-mic" />
- <ctl name="ABOX OEM AP Call BW" value="0x020201" />
- <ctl name="ABOX OEM Bargein type" value="2" />
- <ctl name="ABOX OEM FM Mode" value="2" />
- </path>
-
<path name="dev-headset-mic">
<ctl name="IN1L Mux" value="B" />
<ctl name="AIF1TX1 Input 1" value="IN1L" />
@@ -3659,10 +3658,8 @@
<!-- Input stage volume -->
<!-- media input volume -->
<path name="gain-media-mic">
- <ctl name="IN1R Volume" value="18" />
- <ctl name="IN1L Volume" value="18" />
- <ctl name="IN1R Digital Volume" value="128" />
- <ctl name="IN1L Digital Volume" value="128" />
+ <ctl name="IN1L Volume" value="12" />
+ <ctl name="IN1L Digital Volume" value="122" />
</path>
<path name="gain-media-2nd-mic">
@@ -3817,7 +3814,8 @@
<!-- recognition input volume -->
<path name="gain-recognition-mic">
- <path name="gain-media-mic" />
+ <ctl name="IN1L Volume" value="31" />
+ <ctl name="IN1L Digital Volume" value="128" />
</path>
<path name="gain-recognition-2nd-mic">