aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Brewer <lycanrom@hotmail.com>2014-09-01 14:24:22 -0400
committerJohn Brewer <lycanrom@hotmail.com>2014-09-01 14:24:22 -0400
commit3fa7a35465b76da64c77496ef02dc26e2447182b (patch)
tree20e5c5727a8b2b2083fd87ecce2819580f6a3f49
parent4f65310dbacb542d304830d68955739566c5d18c (diff)
Revert "msm8960dt: Fix speaker paths for voice calls"HEADkitkat
Seemed to break boot on devices, a fix hasn't been merged yet in source so reverting for now until a proper fix has been found This reverts commit 4f65310dbacb542d304830d68955739566c5d18c.
-rw-r--r--config/snd_soc_msm_2x43
1 files changed, 24 insertions, 19 deletions
diff --git a/config/snd_soc_msm_2x b/config/snd_soc_msm_2x
index 89bb895..0ac0976 100644
--- a/config/snd_soc_msm_2x
+++ b/config/snd_soc_msm_2x
@@ -532,14 +532,13 @@ SectionVerb
EndSection
SectionVerb
- Name "Voice CallVoice Speaker"
+ Name "Voice CallSpeaker"
EnableSequence
EndSequence
DisableSequence
- # HASH: this causes widgets to hang when writing this
- # 'VOC_EXT_EC MUX':1:0
+ 'VOC_EXT_EC MUX':1:0
'MI2S_RX_Voice Mixer CSVoice':1:0
'Voice_Tx Mixer SLIM_0_TX_Voice':1:0
EndSequence
@@ -551,11 +550,10 @@ SectionVerb
EndSection
SectionVerb
- Name "Voice CallSpeaker DMIC Endfire"
+ Name "Voice CallLine"
EnableSequence
- # HASH: this causes widgets to hang when writing this
- # 'VOC_EXT_EC MUX':1:1
+ 'VOC_EXT_EC MUX':1:1
'MI2S_RX_Voice Mixer CSVoice':1:1
'Voice_Tx Mixer SLIM_0_TX_Voice':1:1
EndSequence
@@ -2334,7 +2332,6 @@ SectionDevice
EndSection
SectionDevice
- # MI2S Line - Motorola
Name "Speaker DMIC Endfire"
Comment "Dual MIC Endfire Tx device"
@@ -2411,12 +2408,16 @@ SectionDevice
EnableSequence
'AIF1_CAP Mixer SLIM TX7':1:1
'AIF1_CAP Mixer SLIM TX8':1:1
- 'SLIM TX7 MUX':0:DEC7
- 'DEC7 MUX':0:DMIC1
- 'SLIM TX8 MUX':0:DEC10
- 'DEC10 MUX':0:DMIC3
- 'MICBIAS1 CAPLESS Switch':1:0
- 'MICBIAS3 CAPLESS Switch':1:0
+ 'SLIM TX7 MUX':0:DEC3
+ 'DEC3 MUX':0:ADC4
+ 'DEC3 Volume':1:82
+ 'ADC4 Volume':1:100
+ 'SLIM TX8 MUX':0:DEC4
+ 'DEC4 MUX':0:ADC3
+ 'DEC4 Volume':1:82
+ 'ADC3 Volume':1:50
+ 'MICBIAS1 CAPLESS Switch':1:1
+ 'MICBIAS3 CAPLESS Switch':1:1
'SLIM_0_TX Channels':0:Two
EndSequence
@@ -2424,9 +2425,13 @@ SectionDevice
'AIF1_CAP Mixer SLIM TX7':1:0
'AIF1_CAP Mixer SLIM TX8':1:0
'SLIM TX7 MUX':0:ZERO
- 'DEC7 MUX':0:ZERO
+ 'DEC4 MUX':0:ZERO
+ 'DEC4 Volume':1:0
'SLIM TX8 MUX':0:ZERO
- 'DEC10 MUX':0:ZERO
+ 'DEC3 MUX':0:ZERO
+ 'DEC3 Volume':1:0
+ 'ADC3 Volume':1:0
+ 'ADC4 Volume':1:0
'MICBIAS1 CAPLESS Switch':1:0
'MICBIAS3 CAPLESS Switch':1:0
EndSequence
@@ -3254,9 +3259,9 @@ SectionModifier
EnableSequence
EndSequence
+ # HASH: this causes widgets to hang when writing this
+ # 'VOC_EXT_EC MUX':1:0
DisableSequence
- # HASH: this causes widgets to hang when writing this
- # 'VOC_EXT_EC MUX':1:0
'MI2S_RX_Voice Mixer CSVoice':1:0
'Voice_Tx Mixer SLIM_0_TX_Voice':1:0
EndSequence
@@ -3270,9 +3275,9 @@ EndSection
SectionModifier
Name "Play VoiceSpeaker DMIC Endfire"
+ # HASH: this causes widgets to hang when writing this
+ # 'VOC_EXT_EC MUX':1:1
EnableSequence
- # HASH: this causes widgets to hang when writing this
- # 'VOC_EXT_EC MUX':1:1
'MI2S_RX_Voice Mixer CSVoice':1:1
'Voice_Tx Mixer SLIM_0_TX_Voice':1:1
EndSequence