diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-08-24 15:29:11 -0700 |
|---|---|---|
| committer | John Brewer <lycanrom@hotmail.com> | 2014-08-28 21:27:41 -0400 |
| commit | 4f65310dbacb542d304830d68955739566c5d18c (patch) | |
| tree | 084aafbe0e91f803010a22e21c3b7837eacd11c4 | |
| parent | c34e414ba3808141e64e9d25a80099ee3445c27a (diff) | |
msm8960dt: Fix speaker paths for voice calls
* Motorola splits the Speaker enable portion into Voice CallSpeaker
and Voice CallMI2S Line.
Change-Id: I1acfa773ead9e8df030714e5ac58b763f78837b6
| -rw-r--r-- | config/snd_soc_msm_2x | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/config/snd_soc_msm_2x b/config/snd_soc_msm_2x index 0ac0976..89bb895 100644 --- a/config/snd_soc_msm_2x +++ b/config/snd_soc_msm_2x @@ -532,13 +532,14 @@ SectionVerb EndSection SectionVerb - Name "Voice CallSpeaker" + Name "Voice CallVoice Speaker" EnableSequence EndSequence DisableSequence - 'VOC_EXT_EC MUX':1:0 + # 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 @@ -550,10 +551,11 @@ SectionVerb EndSection SectionVerb - Name "Voice CallLine" + Name "Voice CallSpeaker DMIC Endfire" EnableSequence - 'VOC_EXT_EC MUX':1:1 + # 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 @@ -2332,6 +2334,7 @@ SectionDevice EndSection SectionDevice + # MI2S Line - Motorola Name "Speaker DMIC Endfire" Comment "Dual MIC Endfire Tx device" @@ -2408,16 +2411,12 @@ SectionDevice EnableSequence 'AIF1_CAP Mixer SLIM TX7':1:1 'AIF1_CAP Mixer SLIM TX8':1:1 - '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 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_0_TX Channels':0:Two EndSequence @@ -2425,13 +2424,9 @@ SectionDevice 'AIF1_CAP Mixer SLIM TX7':1:0 'AIF1_CAP Mixer SLIM TX8':1:0 'SLIM TX7 MUX':0:ZERO - 'DEC4 MUX':0:ZERO - 'DEC4 Volume':1:0 + 'DEC7 MUX':0:ZERO 'SLIM TX8 MUX':0:ZERO - 'DEC3 MUX':0:ZERO - 'DEC3 Volume':1:0 - 'ADC3 Volume':1:0 - 'ADC4 Volume':1:0 + 'DEC10 MUX':0:ZERO 'MICBIAS1 CAPLESS Switch':1:0 'MICBIAS3 CAPLESS Switch':1:0 EndSequence @@ -3259,9 +3254,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 @@ -3275,9 +3270,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 |
