Merge "audio: update tuning parameter" into jb-mr1-dev
diff --git a/snd_soc_msm_2x_Fusion3 b/snd_soc_msm_2x_Fusion3
index 3fe8f99..98c2c22 100644
--- a/snd_soc_msm_2x_Fusion3
+++ b/snd_soc_msm_2x_Fusion3
@@ -31,6 +31,8 @@
'RX2 MIX1 INP2':0:RX7
'HPHL DAC Switch':1:1
'HPHR DAC Switch':1:1
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:50
'HPHR Volume':1:50
'SLIM TX3 MUX':0:RMIX1
@@ -484,8 +486,8 @@
EndSequence
DisableSequence
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
EndSequence
@@ -533,7 +535,7 @@
EndSequence
DisableSequence
- 'RX3 Digital Volume':1:60
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:0
'LINEOUT3 Volume':1:0
'STUB_RX Mixer Voice Stub':1:0
@@ -1087,6 +1089,7 @@
'SLIM_0_RX Channels':0:One
'RX1 MIX1 INP1':0:RX1
'RX1 MIX1 INP2':0:RX6
+ 'RX1 Digital Volume':1:68
'EAR PA Gain':0:POS_6_DB
'DAC1 Switch':1:1
'SLIM TX3 MUX':0:RMIX1
@@ -1095,6 +1098,7 @@
DisableSequence
'RX1 MIX1 INP1':0:ZERO
'RX1 MIX1 INP2':0:ZERO
+ 'RX1 Digital Volume':1:68
'DAC1 Switch':1:0
'SLIM TX3 MUX':0:ZERO
EndSequence
@@ -1112,7 +1116,7 @@
'SLIM_0_RX Channels':0:One
'RX1 MIX1 INP1':0:RX1
'RX1 MIX1 INP2':0:RX6
- 'RX1 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
'EAR PA Gain':0:POS_6_DB
'DAC1 Switch':1:1
'SLIM TX3 MUX':0:RMIX1
@@ -1121,7 +1125,7 @@
DisableSequence
'RX1 MIX1 INP1':0:ZERO
'RX1 MIX1 INP2':0:ZERO
- 'RX1 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
'DAC1 Switch':1:0
'SLIM TX3 MUX':0:ZERO
EndSequence
@@ -1147,7 +1151,7 @@
DisableSequence
'RX1 MIX1 INP1':0:ZERO
'RX1 MIX1 INP2':0:ZERO
- 'RX1 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
'DAC1 Switch':1:0
'SLIM TX3 MUX':0:ZERO
EndSequence
@@ -1164,7 +1168,7 @@
'SLIM_0_RX Channels':0:One
'RX1 MIX1 INP1':0:RX1
'RX1 MIX1 INP2':0:RX6
- 'RX1 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
'EAR PA Gain':0:POS_6_DB
'DAC1 Switch':1:1
EndSequence
@@ -1172,7 +1176,7 @@
DisableSequence
'RX1 MIX1 INP1':0:ZERO
'RX1 MIX1 INP2':0:ZERO
- 'RX1 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
'DAC1 Switch':1:0
EndSequence
@@ -1220,6 +1224,7 @@
'RX3 MIX1 INP1':0:RX1
'RX3 MIX1 INP2':0:RX6
'RX4 DSM MUX':0:DSM_INV
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:100
'LINEOUT3 Volume':1:100
'SLIM TX3 MUX':0:RMIX3
@@ -1229,6 +1234,7 @@
'RX3 MIX1 INP1':0:ZERO
'RX3 MIX1 INP2':0:ZERO
'RX4 DSM MUX':0:CIC_OUT
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:0
'LINEOUT3 Volume':1:0
'SLIM TX3 MUX':0:ZERO
@@ -1251,6 +1257,8 @@
'RX2 MIX1 INP2':0:RX7
'HPHL DAC Switch':1:1
'HPHR DAC Switch':1:1
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:50
'HPHR Volume':1:50
'SLIM TX3 MUX':0:RMIX1
@@ -1264,6 +1272,8 @@
'RX2 MIX1 INP2':0:ZERO
'HPHL DAC Switch':1:0
'HPHR DAC Switch':1:0
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
'SLIM TX3 MUX':0:ZERO
@@ -1302,8 +1312,8 @@
'RX2 MIX1 INP2':0:ZERO
'HPHL DAC Switch':1:0
'HPHR DAC Switch':1:0
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
'SLIM TX3 MUX':0:ZERO
@@ -1326,18 +1336,17 @@
'RX5 MIX1 INP2':0:RX7
'RX4 DSM MUX':0:DSM_INV
'RX6 DSM MUX':0:DSM_INV
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:66
- 'LINEOUT2 Volume':1:66
'LINEOUT3 Volume':1:66
- 'LINEOUT4 Volume':1:66
'RX1 MIX1 INP1':0:RX1
'RX1 MIX1 INP2':0:RX6
'RX2 MIX1 INP1':0:RX2
'RX2 MIX1 INP2':0:RX7
'HPHL DAC Switch':1:1
'HPHR DAC Switch':1:1
- 'RX1 Digital Volume':1:50
- 'RX2 Digital Volume':1:50
+ 'RX1 Digital Volume':1:53
+ 'RX2 Digital Volume':1:53
'HPHL Volume':1:80
'HPHR Volume':1:80
'SLIM TX3 MUX':0:RMIX1
@@ -1351,18 +1360,17 @@
'RX5 MIX1 INP2':0:ZERO
'RX4 DSM MUX':0:CIC_OUT
'RX6 DSM MUX':0:CIC_OUT
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:0
- 'LINEOUT2 Volume':1:0
'LINEOUT3 Volume':1:0
- 'LINEOUT4 Volume':1:0
'RX1 MIX1 INP1':0:ZERO
'RX1 MIX1 INP2':0:ZERO
'RX2 MIX1 INP1':0:ZERO
'RX2 MIX1 INP2':0:ZERO
'HPHL DAC Switch':1:0
'HPHR DAC Switch':1:0
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
'SLIM TX3 MUX':0:ZERO
@@ -2016,8 +2024,8 @@
'RX2 MIX1 INP1':0:RX6
'HPHL DAC Switch':1:1
'HPHR DAC Switch':1:1
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:80
'HPHR Volume':1:80
EndSequence
@@ -2028,8 +2036,8 @@
'RX2 MIX1 INP1':0:ZERO
'HPHL DAC Switch':1:0
'HPHR DAC Switch':1:0
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
EndSequence
@@ -2076,8 +2084,8 @@
'RX2 MIX1 INP1':0:RX6
'HPHL DAC Switch':1:1
'HPHR DAC Switch':1:1
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:80
'HPHR Volume':1:80
EndSequence
@@ -2088,8 +2096,8 @@
'RX2 MIX1 INP1':0:ZERO
'HPHL DAC Switch':1:0
'HPHR DAC Switch':1:0
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
EndSequence
@@ -2316,6 +2324,37 @@
EndSection
SectionModifier
+ Name "Play MusicHeadphones"
+ Comment "Modifier for music playback via headphone"
+
+ EnableSequence
+ 'SLIMBUS_0_RX Audio Mixer MultiMedia1':1:1
+ 'SLIM_0_RX Channels':0:Two
+ 'RX1 MIX1 INP1':0:RX1
+ 'RX1 MIX1 INP2':0:RX6
+ 'RX2 MIX1 INP1':0:RX2
+ 'RX2 MIX1 INP2':0:RX7
+ 'HPHL DAC Switch':1:1
+ 'HPHR DAC Switch':1:1
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
+ 'HPHL Volume':1:50
+ 'HPHR Volume':1:50
+ 'SLIM TX3 MUX':0:RMIX1
+ 'SLIM TX5 MUX':0:RMIX2
+ EndSequence
+
+ DisableSequence
+ 'SLIMBUS_0_RX Audio Mixer MultiMedia1':1:0
+ EndSequence
+
+ # ALSA PCMs
+ CapturePCM 0
+ PlaybackPCM 0
+
+EndSection
+
+SectionModifier
Name "Play MusicSpeaker FM Tx"
Comment "Modifier for music playback"
@@ -2683,8 +2722,8 @@
EndSequence
DisableSequence
- 'RX1 Digital Volume':1:60
- 'RX2 Digital Volume':1:60
+ 'RX1 Digital Volume':1:68
+ 'RX2 Digital Volume':1:68
'HPHL Volume':1:0
'HPHR Volume':1:0
EndSequence
@@ -2765,7 +2804,7 @@
EndSequence
DisableSequence
- 'RX3 Digital Volume':1:60
+ 'RX3 Digital Volume':1:68
'LINEOUT1 Volume':1:0
'LINEOUT3 Volume':1:0
'STUB_RX Mixer Voice Stub':1:0
