summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-04-13 00:16:48 +0000
committerDaniel Hillenbrand <codeworkx@cyanogenmod.org>2013-04-13 00:16:48 +0000
commit02cb2585b1f0415e35623a284ef843ffedccd4ad (patch)
treef7ca8344fdf75826b3cf5dac0b725786f5f0a67f
parenta7483df74c6683a04bd77090b2ab4b6b1eab1448 (diff)
downloaddevice_samsung_p3100-02cb2585b1f0415e35623a284ef843ffedccd4ad.zip
device_samsung_p3100-02cb2585b1f0415e35623a284ef843ffedccd4ad.tar.gz
device_samsung_p3100-02cb2585b1f0415e35623a284ef843ffedccd4ad.tar.bz2
p31xx: fix incall headset mic
Change-Id: I984d6d4d4f669adcab1d62c9b939587bb989faf3
-rw-r--r--audio/audio_hw.h5
-rw-r--r--configs/tiny_hw.xml14
2 files changed, 17 insertions, 2 deletions
diff --git a/audio/audio_hw.h b/audio/audio_hw.h
index dfeef02..ee52ca9 100644
--- a/audio/audio_hw.h
+++ b/audio/audio_hw.h
@@ -154,12 +154,15 @@ struct route_setting headset_input[] = {
{ .ctl_name = "AIF2DAC2L Mixer AIF2 Switch", .intval = 0, },
{ .ctl_name = "AIF2DAC2R Mixer AIF2 Switch", .intval = 0, },
{ .ctl_name = "Headphone ZC Switch", .intval = 0, },
- { .ctl_name = "AIF1DAC1 Volume", .intval = 60, },
+ { .ctl_name = "AIF1DAC1 Volume", .intval = 110, },
{ .ctl_name = "AIF2DAC Volume", .intval = 96, },
{ .ctl_name = "AIF1 Boost Volume", .intval = 0, },
{ .ctl_name = "AIF2 Boost Volume", .intval = 0, },
{ .ctl_name = "DAC1 Volume", .intval = 96, },
{ .ctl_name = "Headphone Volume", .intval = 54, },
+ { .ctl_name = "MIXINR IN1R Switch", .intval = 1, },
+ { .ctl_name = "MIXINR IN2R Switch", .intval = 1, },
+ { .ctl_name = "IN1R Volume", .intval = 25, },
{ .ctl_name = NULL, },
};
diff --git a/configs/tiny_hw.xml b/configs/tiny_hw.xml
index b520630..9a22e4a 100644
--- a/configs/tiny_hw.xml
+++ b/configs/tiny_hw.xml
@@ -204,6 +204,10 @@ We are able to have most of our routing static so do that
<ctl name="AIF1ADC1 HPF Switch" val="1"/>
<ctl name="AIF2 Mode" val="Master"/>
<ctl name="AIF2DAC Mux" val="AIF3DACDAT"/>
+ <ctl name="AIF2DAC2L Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2L Mixer Right Sidetone Switch" val="1"/>
+ <ctl name="AIF2DAC2R Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Right Sidetone Switch" val="1"/>
</path>
<path name="off">
<ctl name="Main Mic Switch" val="0"/>
@@ -219,9 +223,13 @@ We are able to have most of our routing static so do that
<ctl name="Headset Mic Switch" val="1"/>
<ctl name="AIF1ADCL Source" val="Right"/>
<ctl name="AIF1ADCR Source" val="Right"/>
- <ctl name="AIF2ADCL Source" val="Right"/>
+ <ctl name="AIF2ADCL Source" val="Left"/>
<ctl name="AIF2ADCR Source" val="Right"/>
<ctl name="MIXINR IN1R Switch" val="1"/>
+ <ctl name="AIF2DAC2L Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2L Mixer Right Sidetone Switch" val="1"/>
+ <ctl name="AIF2DAC2R Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Right Sidetone Switch" val="1"/>
</path>
<path name="off">
<ctl name="Headset Mic Switch" val="0"/>
@@ -237,6 +245,10 @@ We are able to have most of our routing static so do that
<ctl name="AIF2ADCR Source" val="Left"/>
<ctl name="AIF1ADC1R Mixer AIF2 Switch" val="1"/>
<ctl name="AIF1ADC1L Mixer AIF2 Switch" val="1"/>
+ <ctl name="AIF2DAC2L Mixer Left Sidetone Switch" val="1"/>
+ <ctl name="AIF2DAC2L Mixer Right Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Left Sidetone Switch" val="0"/>
+ <ctl name="AIF2DAC2R Mixer Right Sidetone Switch" val="1"/>
</path>
<path name="off">
<ctl name="AIF2ADC Mux" val="0"/>