configs: msm8998: Add support for right speaker as mono device
Add new device and update mixer control to support right speaker
as mono device.
CRs-Fixed: 1082853
Change-Id: I541877b82403844ced829a8cd0fa25e9c2208fd9
Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
diff --git a/configs/msm8998/mixer_paths_tasha.xml b/configs/msm8998/mixer_paths_tasha.xml
index 6e8ec47..328efcc 100644
--- a/configs/msm8998/mixer_paths_tasha.xml
+++ b/configs/msm8998/mixer_paths_tasha.xml
@@ -589,6 +589,14 @@
<ctl name="VOC_EXT_EC MUX" value="SLIM_1_TX" />
</path>
+ <path name="echo-reference speaker-vbat-mono-2">
+ <ctl name="AIF3_CAP Mixer SLIM TX2" value="1" />
+ <ctl name="SLIM TX2 MUX" value="RX_MIX_TX2" />
+ <ctl name="RX MIX TX2 MUX" value="RX_MIX_VBAT8" />
+ <ctl name="SLIM_1_TX Channels" value="One" />
+ <ctl name="VOC_EXT_EC MUX" value="SLIM_1_TX" />
+ </path>
+
<path name="echo-reference speaker-vbat">
<ctl name="AIF3_CAP Mixer SLIM TX1" value="1" />
<ctl name="AIF3_CAP Mixer SLIM TX2" value="1" />
@@ -1628,6 +1636,11 @@
<path name="compress-voip-call"/>
</path>
+ <path name="compress-voip-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="compress-voip-call"/>
+ </path>
+
<path name="vowlan-call">
<ctl name="SLIM_0_RX_Voice Mixer VoWLAN" value="1" />
<ctl name="VoWLAN_Tx Mixer SLIM_0_TX_VoWLAN" value="1" />
@@ -1673,6 +1686,11 @@
<path name="vowlan-call"/>
</path>
+ <path name="vowlan-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="vowlan-call"/>
+ </path>
+
<path name="voicemmode1-call">
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1718,6 +1736,11 @@
<path name="voicemmode1-call"/>
</path>
+ <path name="voicemmode1-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="voicemmode1-call"/>
+ </path>
+
<path name="voicemmode2-call">
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1763,6 +1786,11 @@
<path name="voicemmode2-call"/>
</path>
+ <path name="voicemmode2-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="voicemmode2-call"/>
+ </path>
+
<path name="listen-voice-wakeup-1">
<ctl name="LSM1 MUX" value="SLIMBUS_5_TX" />
<ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" />
@@ -1935,6 +1963,17 @@
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
</path>
+ <path name="speaker-mono-2">
+ <ctl name="COMP8 Switch" value="1" />
+ <ctl name="SLIM RX1 MUX" value="AIF_MIX1_PB" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
+ <ctl name="SpkrRight COMP Switch" value="1" />
+ <ctl name="SpkrRight BOOST Switch" value="1" />
+ <ctl name="SpkrRight VISENSE Switch" value="1" />
+ <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ </path>
+
<path name="speaker-liquid">
<path name="speaker" />
</path>
@@ -1944,6 +1983,11 @@
<ctl name="RX INT7 VBAT SPKRL VBAT Enable" value="1" />
</path>
+ <path name="speaker-vbat-mono-2">
+ <path name="speaker-mono-2" />
+ <ctl name="RX INT8 VBAT SPKRL VBAT Enable" value="1" />
+ </path>
+
<path name="speaker-vbat">
<path name="speaker" />
<ctl name="RX INT7 VBAT SPKRL VBAT Enable" value="1" />
@@ -1997,15 +2041,29 @@
<path name="voice-speaker-protected">
<ctl name="AIF4_VI Mixer SPKR_VI_1" value="1" />
- <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
+ <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
<path name="speaker-mono" />
<ctl name="VI_FEED_TX Channels" value="One" />
<ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
+ <path name="voice-speaker-2-protected">
+ <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
+ <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
+ <path name="speaker-mono-2" />
+ <ctl name="VI_FEED_TX Channels" value="One" />
+ <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
+ </path>
+
<path name="vi-feedback">
</path>
+ <path name="vi-feedback-mono-1">
+ </path>
+
+ <path name="vi-feedback-mono-2">
+ </path>
+
<path name="speaker-protected-vbat">
<path name="speaker-protected" />
<ctl name="RX INT7 VBAT SPKRL VBAT Enable" value="1" />
@@ -2017,6 +2075,11 @@
<ctl name="RX INT7 VBAT SPKRL VBAT Enable" value="1" />
</path>
+ <path name="voice-speaker-2-protected-vbat">
+ <path name="voice-speaker-2-protected" />
+ <ctl name="RX INT8 VBAT SPKRL VBAT Enable" value="1" />
+ </path>
+
<path name="handset">
<ctl name="COMP7 Switch" value="1" />
<ctl name="SLIM RX0 MUX" value="AIF_MIX1_PB" />
@@ -2143,6 +2206,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-2">
+ <path name="speaker-mono-2" />
+ </path>
+
<path name="voice-speaker-fluid">
<path name="speaker-fluid" />
</path>
@@ -2155,6 +2222,10 @@
<path name="speaker-vbat-mono" />
</path>
+ <path name="voice-speaker-2-vbat">
+ <path name="speaker-vbat-mono-2" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
<ctl name="RX HPH Mode" value="CLS_H_LP" />
diff --git a/configs/msm8998/mixer_paths_tavil.xml b/configs/msm8998/mixer_paths_tavil.xml
index f047feb..bfb2fbe 100644
--- a/configs/msm8998/mixer_paths_tavil.xml
+++ b/configs/msm8998/mixer_paths_tavil.xml
@@ -538,6 +538,9 @@
<path name="echo-reference speaker-vbat-mono">
</path>
+ <path name="echo-reference speaker-vbat-mono-2">
+ </path>
+
<path name="echo-reference speaker-vbat">
</path>
@@ -1592,6 +1595,11 @@
<path name="compress-voip-call"/>
</path>
+ <path name="compress-voip-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="compress-voip-call"/>
+ </path>
+
<path name="voicemmode1-call">
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode1" value="1" />
<ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
@@ -1637,6 +1645,11 @@
<path name="voicemmode1-call"/>
</path>
+ <path name="voicemmode1-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="voicemmode1-call"/>
+ </path>
+
<path name="voicemmode2-call">
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
@@ -1682,6 +1695,11 @@
<path name="voicemmode2-call"/>
</path>
+ <path name="voicemmode2-call voice-speaker-2-vbat">
+ <path name="echo-reference speaker-vbat-mono-2" />
+ <path name="voicemmode2-call"/>
+ </path>
+
<path name="spkr-rx-calib">
<ctl name="SLIMBUS_DL_HL Switch" value="1" />
</path>
@@ -1795,6 +1813,18 @@
<ctl name="SpkrLeft SWR DAC_Port Switch" value="1" />
</path>
+ <path name="speaker-mono-2">
+ <ctl name="SLIM RX1 MUX" value="AIF1_PB" />
+ <ctl name="CDC_IF RX1 MUX" value="SLIM RX1" />
+ <ctl name="SLIM_0_RX Channels" value="One" />
+ <ctl name="RX INT8_1 MIX1 INP0" value="RX1" />
+ <ctl name="COMP8 Switch" value="1" />
+ <ctl name="SpkrRight COMP Switch" value="1" />
+ <ctl name="SpkrRight BOOST Switch" value="1" />
+ <ctl name="SpkrRight VISENSE Switch" value="1" />
+ <ctl name="SpkrRight SWR DAC_Port Switch" value="1" />
+ </path>
+
<path name="speaker-fluid">
<path name="speaker-mono" />
</path>
@@ -1807,6 +1837,10 @@
<path name="speaker-mono" />
</path>
+ <path name="speaker-vbat-mono-2">
+ <path name="speaker-mono-2" />
+ </path>
+
<path name="speaker-vbat">
<path name="speaker" />
</path>
@@ -1861,9 +1895,23 @@
<ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
</path>
+ <path name="voice-speaker-2-protected">
+ <ctl name="AIF4_VI Mixer SPKR_VI_2" value="1" />
+ <ctl name="SLIM_4_TX Format" value="PACKED_16B" />
+ <path name="speaker-mono-2" />
+ <ctl name="VI_FEED_TX Channels" value="One" />
+ <ctl name="SLIM0_RX_VI_FB_LCH_MUX" value="SLIM4_TX" />
+ </path>
+
<path name="vi-feedback">
</path>
+ <path name="vi-feedback-mono-1">
+ </path>
+
+ <path name="vi-feedback-mono-2">
+ </path>
+
<path name="speaker-protected-vbat">
<path name="speaker-protected" />
</path>
@@ -1872,6 +1920,10 @@
<path name="voice-speaker-protected" />
</path>
+ <path name="voice-speaker-2-protected-vbat">
+ <path name="voice-speaker-2-protected" />
+ </path>
+
<path name="handset">
<ctl name="SLIM RX0 MUX" value="AIF1_PB" />
<ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
@@ -2002,6 +2054,10 @@
<path name="speaker-mono" />
</path>
+ <path name="voice-speaker-2">
+ <path name="speaker-mono-2" />
+ </path>
+
<path name="voice-speaker-fluid">
<path name="speaker-fluid" />
</path>
@@ -2014,6 +2070,10 @@
<path name="speaker-vbat-mono" />
</path>
+ <path name="voice-speaker-2-vbat">
+ <path name="speaker-vbat-mono-2" />
+ </path>
+
<path name="voice-headphones">
<path name="headphones" />
</path>