audio: Add wsa combo device for Jacala MTP
Add WSA speaker combo path and other missing mixer controls
for MTP and SKUM devices.
Change-Id: Icfc544b167a447dba63fde5e20290dcdc88824bd
diff --git a/configs/msm8953/mixer_paths_mtp.xml b/configs/msm8953/mixer_paths_mtp.xml
index 42a9e68..b9fc59a 100644
--- a/configs/msm8953/mixer_paths_mtp.xml
+++ b/configs/msm8953/mixer_paths_mtp.xml
@@ -442,13 +442,22 @@
<ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="1" />
</path>
+ <path name="compress-offload-playback2 afe-proxy">
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
+ <path name="compress-offload-playback2 usb-headphones">
+ <path name="compress-offload-playback2 afe-proxy" />
+ </path>
+
<path name="compress-offload-playback2 speaker-and-hdmi">
<path name="compress-offload-playback2 hdmi" />
<path name="compress-offload-playback2" />
</path>
- <path name="compress-offload-playback2 afe-proxy">
- <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
+ <path name="compress-offload-playback2 speaker-and-usb-headphones">
+ <path name="compress-offload-playback2 usb-headphones" />
+ <path name="compress-offload-playback2" />
</path>
<path name="compress-offload-playback transmission-fm">
@@ -1105,6 +1114,11 @@
<path name="headphones" />
</path>
+ <path name="wsa-speaker-and-headphones">
+ <path name="wsa-speaker" />
+ <path name="headphones" />
+ </path>
+
<path name="usb-headphones">
</path>
@@ -1119,6 +1133,11 @@
<path name="usb-headphones" />
</path>
+ <path name="wsa-speaker-and-usb-headphones">
+ <path name="wsa-speaker" />
+ <path name="usb-headphones" />
+ </path>
+
<path name="voice-rec-mic">
<path name="handset-mic" />
</path>
@@ -1270,4 +1289,8 @@
<path name="speaker-and-headphones" />
</path>
+ <path name="wsa-speaker-and-line">
+ <path name="wsa-speaker-and-headphones" />
+ </path>
+
</mixer>
diff --git a/configs/msm8953/mixer_paths_qrd_skum.xml b/configs/msm8953/mixer_paths_qrd_skum.xml
index 8343847..6aa8e1e 100644
--- a/configs/msm8953/mixer_paths_qrd_skum.xml
+++ b/configs/msm8953/mixer_paths_qrd_skum.xml
@@ -366,6 +366,28 @@
<ctl name="INTERNAL_FM_RX Audio Mixer MultiMedia4" value="1" />
</path>
+ <path name="compress-offload-playback2 hdmi">
+ <ctl name="QUIN_MI2S_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
+ <path name="compress-offload-playback2 afe-proxy">
+ <ctl name="AFE_PCM_RX Audio Mixer MultiMedia7" value="1" />
+ </path>
+
+ <path name="compress-offload-playback2 usb-headphones">
+ <path name="compress-offload-playback2 afe-proxy" />
+ </path>
+
+ <path name="compress-offload-playback2 speaker-and-hdmi">
+ <path name="compress-offload-playback2 hdmi" />
+ <path name="compress-offload-playback2" />
+ </path>
+
+ <path name="compress-offload-playback2 speaker-and-usb-headphones">
+ <path name="compress-offload-playback2 usb-headphones" />
+ <path name="compress-offload-playback2" />
+ </path>
+
<path name="compress-offload-playback3">
<ctl name="PRI_MI2S_RX Audio Mixer MultiMedia10" value="1" />
</path>
@@ -795,6 +817,11 @@
<path name="headphones" />
</path>
+ <path name="wsa-speaker-and-headphones">
+ <path name="wsa-speaker" />
+ <path name="headphones" />
+ </path>
+
<path name="usb-headphones">
</path>
@@ -809,6 +836,11 @@
<path name="usb-headphones" />
</path>
+ <path name="wsa-speaker-and-usb-headphones">
+ <path name="wsa-speaker" />
+ <path name="usb-headphones" />
+ </path>
+
<path name="voice-rec-mic">
<path name="handset-mic" />
</path>
@@ -934,4 +966,8 @@
<path name="speaker-and-headphones" />
</path>
+ <path name="wsa-speaker-and-line">
+ <path name="wsa-speaker-and-headphones" />
+ </path>
+
</mixer>