From patchwork Tue Nov 27 01:36:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 10699561 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 38A16109C for ; Tue, 27 Nov 2018 01:36:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E4AA2A59D for ; Tue, 27 Nov 2018 01:36:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E2412A5BB; Tue, 27 Nov 2018 01:36:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FED22A59D for ; Tue, 27 Nov 2018 01:36:50 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B0B5C267865; Tue, 27 Nov 2018 02:36:48 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5E7022678E4; Tue, 27 Nov 2018 02:36:46 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 629BE26784E for ; Tue, 27 Nov 2018 02:36:44 +0100 (CET) Received: from [123.112.71.249] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gRSIt-0001L5-GU; Tue, 27 Nov 2018 01:36:44 +0000 From: Hui Wang To: alsa-devel@alsa-project.org Date: Tue, 27 Nov 2018 09:36:28 +0800 Message-Id: <20181127013629.7620-1-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 Cc: tiwai@suse.de Subject: [alsa-devel] [alsa-lib][PATCH 1/2] conf/ucm: Add a UCM profile for Dell WD19 Dock USB-audio X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP USB-audio device on Dell WD19 docking station provides two individual output PCM streams, one for headphone Jack and another for speaker out Jack. A UCM profile gives the proper roles for these. Signed-off-by: Hui Wang --- .../ucm/Dell-WD19-Dock/Dell-WD19-Dock.conf | 5 ++++ src/conf/ucm/Dell-WD19-Dock/HiFi.conf | 26 +++++++++++++++++++ src/conf/ucm/Dell-WD19-Dock/Makefile.am | 4 +++ 3 files changed, 35 insertions(+) create mode 100644 src/conf/ucm/Dell-WD19-Dock/Dell-WD19-Dock.conf create mode 100644 src/conf/ucm/Dell-WD19-Dock/HiFi.conf create mode 100644 src/conf/ucm/Dell-WD19-Dock/Makefile.am diff --git a/src/conf/ucm/Dell-WD19-Dock/Dell-WD19-Dock.conf b/src/conf/ucm/Dell-WD19-Dock/Dell-WD19-Dock.conf new file mode 100644 index 00000000..465ff550 --- /dev/null +++ b/src/conf/ucm/Dell-WD19-Dock/Dell-WD19-Dock.conf @@ -0,0 +1,5 @@ +Comment "USB-audio on Dell WD19 docking station" +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" +} diff --git a/src/conf/ucm/Dell-WD19-Dock/HiFi.conf b/src/conf/ucm/Dell-WD19-Dock/HiFi.conf new file mode 100644 index 00000000..e1427a79 --- /dev/null +++ b/src/conf/ucm/Dell-WD19-Dock/HiFi.conf @@ -0,0 +1,26 @@ +SectionDevice."Headphone" { + Comment "Headphone" + + Value { + PlaybackChannels "2" + PlaybackPCM "hw:Dock,0" + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackChannels "2" + PlaybackPCM "hw:Dock,1" + } +} + +SectionDevice."Mic" { + Comment "Microphone" + + Value { + CaptureChannels "2" + CapturePCM "hw:Dock,0" + } +} diff --git a/src/conf/ucm/Dell-WD19-Dock/Makefile.am b/src/conf/ucm/Dell-WD19-Dock/Makefile.am new file mode 100644 index 00000000..6549ae1b --- /dev/null +++ b/src/conf/ucm/Dell-WD19-Dock/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/Dell-WD19-Dock +ucm_DATA = Dell-WD19-Dock.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) From patchwork Tue Nov 27 01:36:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 10699563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0835715A7 for ; Tue, 27 Nov 2018 01:36:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAC0D2A59D for ; Tue, 27 Nov 2018 01:36:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE06E2A5BB; Tue, 27 Nov 2018 01:36:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76E872A59D for ; Tue, 27 Nov 2018 01:36:55 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 1F45F267A8C; Tue, 27 Nov 2018 02:36:50 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 693A92678E4; Tue, 27 Nov 2018 02:36:48 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by alsa0.perex.cz (Postfix) with ESMTP id 98C6826784E for ; Tue, 27 Nov 2018 02:36:46 +0100 (CET) Received: from [123.112.71.249] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gRSIv-0001L5-Kf; Tue, 27 Nov 2018 01:36:46 +0000 From: Hui Wang To: alsa-devel@alsa-project.org Date: Tue, 27 Nov 2018 09:36:29 +0800 Message-Id: <20181127013629.7620-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181127013629.7620-1-hui.wang@canonical.com> References: <20181127013629.7620-1-hui.wang@canonical.com> Cc: tiwai@suse.de Subject: [alsa-devel] [alsa-lib][PATCH 2/2] conf: USB-Audio: Add Dell WD19 Dock in the IEC958 blacklist X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This Dock doesn't have IEC958 physical output, so add it to the blacklist to prevent it being opened. Signed-off-by: Hui Wang --- src/conf/cards/USB-Audio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 05779c47..3a12a729 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -60,6 +60,7 @@ USB-Audio.pcm.iec958_device { "SWTOR Gaming Headset by Razer" 999 "USB Device 0x46d_0x821" 999 "USB Device 0x46d_0x992" 999 + "WD19 Dock" 999 } # Second iec958 device number, if any.