|
 |
4dfe6a |
From 1e057be093d948faa26b94b6efcae79bee7e6aee Mon Sep 17 00:00:00 2001
|
|
|
4dfe6a |
From: Hui Wang <hui.wang@canonical.com>
|
|
|
4dfe6a |
Date: Fri, 26 May 2017 15:42:40 +0800
|
|
|
4dfe6a |
Subject: [PATCH 1/4] alsa-mixer: Add support for usb audio in the Dell dock
|
|
|
4dfe6a |
TB16
|
|
|
4dfe6a |
|
|
|
4dfe6a |
There are one headset jack on the front panel of TB16, through this
|
|
|
4dfe6a |
jack, we have one stereo headphone output (hw:%f,0,0) and one mono
|
|
|
4dfe6a |
headset-mic input (hw:%f,0,0); and there is one speaker output jack
|
|
|
4dfe6a |
(hw:%f,1,0) on the rear panel of TB16.
|
|
|
4dfe6a |
|
|
|
4dfe6a |
The detail information of the Dell dock TB16:
|
|
|
4dfe6a |
http://www.dell.com/support/article/sg/en/sgbsdt1/SLN301105
|
|
|
4dfe6a |
|
|
|
4dfe6a |
Signed-off-by: Hui Wang <hui.wang@canonical.com>
|
|
|
4dfe6a |
---
|
|
|
4dfe6a |
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 +
|
|
|
4dfe6a |
.../profile-sets/dell-dock-tb16-usb-audio.conf | 55 ++++++++++++++++++++++
|
|
|
4dfe6a |
3 files changed, 57 insertions(+)
|
|
|
4dfe6a |
create mode 100644 src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
|
|
|
4dfe6a |
|
|
|
4dfe6a |
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
4dfe6a |
index 70e34e6fa..805a05b2a 100644
|
|
|
4dfe6a |
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
4dfe6a |
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
4dfe6a |
@@ -98,5 +98,6 @@ ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1021", ENV{PULSE_PROFILE_SET}="nativ
|
|
|
4dfe6a |
ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
|
|
|
4dfe6a |
ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
|
|
|
4dfe6a |
ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
|
|
|
4dfe6a |
+ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
|
|
|
4dfe6a |
|
|
|
4dfe6a |
LABEL="pulseaudio_end"
|
|
|
4dfe6a |
diff --git a/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
|
|
|
4dfe6a |
new file mode 100644
|
|
|
4dfe6a |
index 000000000..118655246
|
|
|
4dfe6a |
--- /dev/null
|
|
|
4dfe6a |
+++ b/src/modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf
|
|
|
4dfe6a |
@@ -0,0 +1,55 @@
|
|
|
4dfe6a |
+# This file is part of PulseAudio.
|
|
|
4dfe6a |
+#
|
|
|
4dfe6a |
+# PulseAudio is free software; you can redistribute it and/or modify
|
|
|
4dfe6a |
+# it under the terms of the GNU Lesser General Public License as
|
|
|
4dfe6a |
+# published by the Free Software Foundation; either version 2.1 of the
|
|
|
4dfe6a |
+# License, or (at your option) any later version.
|
|
|
4dfe6a |
+#
|
|
|
4dfe6a |
+# PulseAudio is distributed in the hope that it will be useful, but
|
|
|
4dfe6a |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
4dfe6a |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
4dfe6a |
+# General Public License for more details.
|
|
|
4dfe6a |
+#
|
|
|
4dfe6a |
+# You should have received a copy of the GNU Lesser General Public License
|
|
|
4dfe6a |
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+; Dell Dock TB16 USB audio
|
|
|
4dfe6a |
+;
|
|
|
4dfe6a |
+; This card has two stereo pairs of output, One Mono input.
|
|
|
4dfe6a |
+;
|
|
|
4dfe6a |
+; See default.conf for an explanation on the directives used here.
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[General]
|
|
|
4dfe6a |
+auto-profiles = no
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[Mapping analog-stereo-headphone]
|
|
|
4dfe6a |
+description = Headphone
|
|
|
4dfe6a |
+device-strings = hw:%f,0,0
|
|
|
4dfe6a |
+channel-map = left,right
|
|
|
4dfe6a |
+direction = output
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[Mapping analog-stereo-speaker]
|
|
|
4dfe6a |
+description = Speaker
|
|
|
4dfe6a |
+device-strings = hw:%f,1,0
|
|
|
4dfe6a |
+channel-map = left,right
|
|
|
4dfe6a |
+direction = output
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[Mapping analog-stereo-mic]
|
|
|
4dfe6a |
+description = Headset-Mic
|
|
|
4dfe6a |
+device-strings = hw:%f,0,0
|
|
|
4dfe6a |
+channel-map = left,right
|
|
|
4dfe6a |
+direction = input
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[Profile output:analog-stereo-speaker]
|
|
|
4dfe6a |
+description = Speaker
|
|
|
4dfe6a |
+output-mappings = analog-stereo-speaker
|
|
|
4dfe6a |
+priority = 60
|
|
|
4dfe6a |
+skip-probe = yes
|
|
|
4dfe6a |
+
|
|
|
4dfe6a |
+[Profile output:analog-stereo-headphone+input:analog-stereo-mic]
|
|
|
4dfe6a |
+description = Headset
|
|
|
4dfe6a |
+output-mappings = analog-stereo-headphone
|
|
|
4dfe6a |
+input-mappings = analog-stereo-mic
|
|
|
4dfe6a |
+priority = 80
|
|
|
4dfe6a |
+skip-probe = yes
|
|
|
4dfe6a |
--
|
|
|
4dfe6a |
2.14.3
|
|
|
4dfe6a |
|