Merge "audio: Add wsa combo device for Jacala MTP" into audio-userspace.lnx.2.1-dev

This commit is contained in:
Linux Build Service Account 2016-08-09 01:56:10 -07:00 committed by Gerrit - the friendly Code Review server
commit 59df92fdf6
2 changed files with 61 additions and 2 deletions

View File

@ -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>

View File

@ -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>