From patchwork Sun Jan 6 03:47:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Parker X-Patchwork-Id: 10749439 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 3BA5B14E2 for ; Sun, 6 Jan 2019 03:49:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2753C28762 for ; Sun, 6 Jan 2019 03:49:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BA2528879; Sun, 6 Jan 2019 03:49:26 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 B3A8828762 for ; Sun, 6 Jan 2019 03:49:24 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A33CD267AB5; Sun, 6 Jan 2019 04:49:23 +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 2DA89267B66; Sun, 6 Jan 2019 04:49:21 +0100 (CET) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by alsa0.perex.cz (Postfix) with ESMTP id 76207267A69; Sun, 6 Jan 2019 04:49:17 +0100 (CET) Received: by mail-pf1-f195.google.com with SMTP id b85so20169773pfc.3; Sat, 05 Jan 2019 19:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+QH5JwuDYtWImC+a4wPGUcRPgjS/EqzKnG26gBuKxBY=; b=CK7YPs/WBQATuEzJ33sEMrqpX13ai1Nizlu8bznVfoIYB6Ubhxh2J9JgSdZ1ZLCo7O HiaV4a0dBDzSLg9OW+I0+Wsp6u0esQDVr7aPtITDFL2KG3dclZ52HHzUIz9P3ocO8u8g 4rkV+Yk2Jb9DWycAdMU4yqpCdcGIxPNAjHNBIoSXSX2zUzAkkRnmUmT7g1TyEXME2342 R9svMdknnqqF7e7PHPFNbSMCiCwY72uDVvGDyqDHbKgEyd6PbA4Ym6qWRfSf6zaqCMaD 458+FeVFc0K+i2NiJGfd3jd0BVTVE8q3eneHnc7iRn/1ltZJls7Rh5y30wKLg19dKRJI e8dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+QH5JwuDYtWImC+a4wPGUcRPgjS/EqzKnG26gBuKxBY=; b=A5W9sGIKZ/b7mDgCESkNfVZdTj010gqGRDaoEeveKTFCeE1rtp8Tzi/mD1srw624Bs PvXJCSOHRmHiHOWZGR9VS+VCBTjJWZeAJKK1RbmWU3WLbv+Wov89ZXMLs8jO0ChR4YUh L7tnn53JwdQaPx4fCBNoJg+aMy4mYmrXo29tEzEvMDVxlHlzxPP8U1ecRwtgn5/OlwsK /PlZA2QYEDg6k+8M33jp6O4QrwoU/ID/WdNu8YGRfrAftz8PfGyNxC4/rFVvm0tzPi94 AYeWRddi0ExzpG/e0LCtq4pECVJBKsMGVnyLTC8nEmMS0LtYmAU6JCLhavJzVBTSHtnt aHLQ== X-Gm-Message-State: AJcUukenx+X4puh4x59R2thQEk+8emgWG29XeB412cbl64v5aybZOTlq Ve4H1GOMnv5ROoeW4u3SvJYno1No X-Google-Smtp-Source: ALg8bN6FODc76kX23l1/ucmTmTd5m0prHPv+dTOrCGG/BgEvI0kXLDZeeObUl7SJIEIc6N9wy3vKww== X-Received: by 2002:a65:448a:: with SMTP id l10mr6704030pgq.387.1546746555653; Sat, 05 Jan 2019 19:49:15 -0800 (PST) Received: from localhost.localdomain ([2601:645:4100:ecc5:2f9d:2af4:bdc3:f667]) by smtp.googlemail.com with ESMTPSA id d129sm95235935pfc.31.2019.01.05.19.49.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jan 2019 19:49:15 -0800 (PST) From: russell.parker7@gmail.com To: patch@alsa-project.org Date: Sat, 5 Jan 2019 19:47:11 -0800 Message-Id: <20190106034715.21045-2-russell.parker7@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190106034715.21045-1-russell.parker7@gmail.com> References: <20190106034715.21045-1-russell.parker7@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Russell Parker Subject: [alsa-devel] [PATCH ucm/conf: 1/5] Update chtrt5645 ucm variants to use bytcr/PlatformEnableSeq.conf component 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell Parker The Lenovo Ideapad Miix 320, Asus T100HA, and chtrt5645 mono variant UCM configurations have not been updated to make use of the shared bytcr/PlatfromEnableSeq.conf sequence. This commit deletes those command sequences and loads the shared component directly. Signed-off-by: Russell Parker diff --git a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf index 78bf9823..61848358 100644 --- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf +++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf @@ -11,121 +11,7 @@ SectionVerb { EnableSequence [ cdev "hw:chtrt5645" - # media mixer settings - # compress - cset "name='media0_in Gain 0 Switch' on" - cset "name='media0_in Gain 0 Volume' 0" - - # normal - cset "name='media1_in Gain 0 Switch' on" - cset "name='media1_in Gain 0 Volume' 0" - # swm loopback - cset "name='media2_in Gain 0 Switch' off" - cset "name='media2_in Gain 0 Volume' 0%" - # deep buffer - cset "name='media3_in Gain 0 Switch' on" - cset "name='media3_in Gain 0 Volume' 0" - - cset "name='media0_out mix 0 media0_in Switch' on" - cset "name='media0_out mix 0 media1_in Switch' on" - cset "name='media0_out mix 0 media2_in Switch' off" - cset "name='media0_out mix 0 media3_in Switch' on" - - cset "name='media1_out mix 0 media0_in Switch' off" - cset "name='media1_out mix 0 media1_in Switch' off" - cset "name='media1_out mix 0 media2_in Switch' off" - cset "name='media1_out mix 0 media3_in Switch' off" - - cset "name='pcm0_in Gain 0 Switch' on" - cset "name='pcm0_in Gain 0 Volume' 0" - - cset "name='pcm1_in Gain 0 Switch' off" - cset "name='pcm1_in Gain 0 Volume' 0%" - - # codec0_out settings (used if ssp2 is connected to aif1) - cset "name='codec_out0 mix 0 codec_in0 Switch' off" - cset "name='codec_out0 mix 0 codec_in1 Switch' off" - cset "name='codec_out0 mix 0 media_loop1_in Switch' off" - cset "name='codec_out0 mix 0 media_loop2_in Switch' off" - cset "name='codec_out0 mix 0 pcm0_in Switch' on" - cset "name='codec_out0 mix 0 pcm1_in Switch' off" - cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out0 Gain 0 Switch' on" - cset "name='codec_out0 Gain 0 Volume' 0" - - # modem_out settings (used if ssp0 is connected to aif2) - cset "name='modem_out mix 0 codec_in0 Switch' off" - cset "name='modem_out mix 0 codec_in1 Switch' off" - cset "name='modem_out mix 0 media_loop1_in Switch' off" - cset "name='modem_out mix 0 media_loop2_in Switch' off" - cset "name='modem_out mix 0 pcm0_in Switch' on" - cset "name='modem_out mix 0 pcm1_in Switch' off" - cset "name='modem_out mix 0 sprot_loop_in Switch' off" - cset "name='modem_out Gain 0 Switch' on" - cset "name='modem_out Gain 0 Volume' 0" - - # input settings - # pcm1_out settings - - # input used when SSP2 is connected - cset "name='codec_in0 Gain 0 Switch' on" - cset "name='codec_in0 Gain 0 Volume' 0" - - # input used when SSP0 is connected - cset "name='modem_in Gain 0 Switch' on" - cset "name='modem_in Gain 0 Volume' 0" - - cset "name='pcm1_out mix 0 codec_in0 Switch' on" - cset "name='pcm1_out mix 0 modem_in Switch' on" - cset "name='pcm1_out mix 0 codec_in1 Switch' off" - cset "name='pcm1_out mix 0 media_loop1_in Switch' off" - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='pcm1_out mix 0 pcm0_in Switch' off" - cset "name='pcm1_out mix 0 pcm1_in Switch' off" - cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - - cset "name='pcm1_out Gain 0 Switch' on" - cset "name='pcm1_out Gain 0 Volume' 0" - - # disable codec_out1 - cset "name='codec_out1 mix 0 codec_in0 Switch' off" - cset "name='codec_out1 mix 0 codec_in1 Switch' off" - cset "name='codec_out1 mix 0 media_loop1_in Switch' off" - cset "name='codec_out1 mix 0 media_loop2_in Switch' off" - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='codec_out1 mix 0 pcm1_in Switch' off" - cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Volume' 0%" - - # disable codec_in1 - cset "name='codec_in1 Gain 0 Switch' off" - cset "name='codec_in1 Gain 0 Volume' 0%" - - # disable all loops - cset "name='media_loop1_out mix 0 codec_in0 Switch' off" - cset "name='media_loop1_out mix 0 codec_in1 Switch' off" - cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop1_out mix 0 pcm0_in Switch' off" - cset "name='media_loop1_out mix 0 pcm1_in Switch' off" - cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - cset "name='media_loop2_out mix 0 codec_in1 Switch' off" - cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 pcm0_in Switch' off" - cset "name='media_loop2_out mix 0 pcm1_in Switch' off" - cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - - cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" - cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" - cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" - cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" - cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" + # Output Configuration cset "name='DAC1 L Mux' IF1 DAC" diff --git a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf index 8cc9c7f2..d043f685 100644 --- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf +++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf @@ -11,121 +11,7 @@ SectionVerb { EnableSequence [ cdev "hw:chtrt5645" - # media mixer settings - # compress - cset "name='media0_in Gain 0 Switch' on" - cset "name='media0_in Gain 0 Volume' 0" - - # normal - cset "name='media1_in Gain 0 Switch' on" - cset "name='media1_in Gain 0 Volume' 0" - # swm loopback - cset "name='media2_in Gain 0 Switch' off" - cset "name='media2_in Gain 0 Volume' 0%" - # deep buffer - cset "name='media3_in Gain 0 Switch' on" - cset "name='media3_in Gain 0 Volume' 0" - - cset "name='media0_out mix 0 media0_in Switch' on" - cset "name='media0_out mix 0 media1_in Switch' on" - cset "name='media0_out mix 0 media2_in Switch' off" - cset "name='media0_out mix 0 media3_in Switch' on" - - cset "name='media1_out mix 0 media0_in Switch' off" - cset "name='media1_out mix 0 media1_in Switch' off" - cset "name='media1_out mix 0 media2_in Switch' off" - cset "name='media1_out mix 0 media3_in Switch' off" - - cset "name='pcm0_in Gain 0 Switch' on" - cset "name='pcm0_in Gain 0 Volume' 0" - - cset "name='pcm1_in Gain 0 Switch' off" - cset "name='pcm1_in Gain 0 Volume' 0%" - - # codec0_out settings (used if ssp2 is connected to aif1) - cset "name='codec_out0 mix 0 codec_in0 Switch' off" - cset "name='codec_out0 mix 0 codec_in1 Switch' off" - cset "name='codec_out0 mix 0 media_loop1_in Switch' off" - cset "name='codec_out0 mix 0 media_loop2_in Switch' off" - cset "name='codec_out0 mix 0 pcm0_in Switch' on" - cset "name='codec_out0 mix 0 pcm1_in Switch' off" - cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out0 Gain 0 Switch' on" - cset "name='codec_out0 Gain 0 Volume' 0" - - # modem_out settings (used if ssp0 is connected to aif2) - cset "name='modem_out mix 0 codec_in0 Switch' off" - cset "name='modem_out mix 0 codec_in1 Switch' off" - cset "name='modem_out mix 0 media_loop1_in Switch' off" - cset "name='modem_out mix 0 media_loop2_in Switch' off" - cset "name='modem_out mix 0 pcm0_in Switch' on" - cset "name='modem_out mix 0 pcm1_in Switch' off" - cset "name='modem_out mix 0 sprot_loop_in Switch' off" - cset "name='modem_out Gain 0 Switch' on" - cset "name='modem_out Gain 0 Volume' 0" - - # input settings - # pcm1_out settings - - # input used when SSP2 is connected - cset "name='codec_in0 Gain 0 Switch' on" - cset "name='codec_in0 Gain 0 Volume' 0" - - # input used when SSP0 is connected - cset "name='modem_in Gain 0 Switch' on" - cset "name='modem_in Gain 0 Volume' 0" - - cset "name='pcm1_out mix 0 codec_in0 Switch' on" - cset "name='pcm1_out mix 0 modem_in Switch' on" - cset "name='pcm1_out mix 0 codec_in1 Switch' off" - cset "name='pcm1_out mix 0 media_loop1_in Switch' off" - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='pcm1_out mix 0 pcm0_in Switch' off" - cset "name='pcm1_out mix 0 pcm1_in Switch' off" - cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - - cset "name='pcm1_out Gain 0 Switch' on" - cset "name='pcm1_out Gain 0 Volume' 0" - - # disable codec_out1 - cset "name='codec_out1 mix 0 codec_in0 Switch' off" - cset "name='codec_out1 mix 0 codec_in1 Switch' off" - cset "name='codec_out1 mix 0 media_loop1_in Switch' off" - cset "name='codec_out1 mix 0 media_loop2_in Switch' off" - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='codec_out1 mix 0 pcm1_in Switch' off" - cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Volume' 0%" - - # disable codec_in1 - cset "name='codec_in1 Gain 0 Switch' off" - cset "name='codec_in1 Gain 0 Volume' 0%" - - # disable all loops - cset "name='media_loop1_out mix 0 codec_in0 Switch' off" - cset "name='media_loop1_out mix 0 codec_in1 Switch' off" - cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop1_out mix 0 pcm0_in Switch' off" - cset "name='media_loop1_out mix 0 pcm1_in Switch' off" - cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - cset "name='media_loop2_out mix 0 codec_in1 Switch' off" - cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 pcm0_in Switch' off" - cset "name='media_loop2_out mix 0 pcm1_in Switch' off" - cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - - cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" - cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" - cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" - cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" - cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" + # Output Configuration cset "name='DAC1 L Mux' IF1 DAC" diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf index 7a0cd51c..c4452a4e 100644 --- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf +++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf @@ -11,121 +11,7 @@ SectionVerb { EnableSequence [ cdev "hw:chtrt5645" - # media mixer settings - # compress - cset "name='media0_in Gain 0 Switch' on" - cset "name='media0_in Gain 0 Volume' 0" - - # normal - cset "name='media1_in Gain 0 Switch' on" - cset "name='media1_in Gain 0 Volume' 0" - # swm loopback - cset "name='media2_in Gain 0 Switch' off" - cset "name='media2_in Gain 0 Volume' 0%" - # deep buffer - cset "name='media3_in Gain 0 Switch' on" - cset "name='media3_in Gain 0 Volume' 0" - - cset "name='media0_out mix 0 media0_in Switch' on" - cset "name='media0_out mix 0 media1_in Switch' on" - cset "name='media0_out mix 0 media2_in Switch' off" - cset "name='media0_out mix 0 media3_in Switch' on" - - cset "name='media1_out mix 0 media0_in Switch' off" - cset "name='media1_out mix 0 media1_in Switch' off" - cset "name='media1_out mix 0 media2_in Switch' off" - cset "name='media1_out mix 0 media3_in Switch' off" - - cset "name='pcm0_in Gain 0 Switch' on" - cset "name='pcm0_in Gain 0 Volume' 0" - - cset "name='pcm1_in Gain 0 Switch' off" - cset "name='pcm1_in Gain 0 Volume' 0%" - - # codec0_out settings (used if ssp2 is connected to aif1) - cset "name='codec_out0 mix 0 codec_in0 Switch' off" - cset "name='codec_out0 mix 0 codec_in1 Switch' off" - cset "name='codec_out0 mix 0 media_loop1_in Switch' off" - cset "name='codec_out0 mix 0 media_loop2_in Switch' off" - cset "name='codec_out0 mix 0 pcm0_in Switch' on" - cset "name='codec_out0 mix 0 pcm1_in Switch' off" - cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out0 Gain 0 Switch' on" - cset "name='codec_out0 Gain 0 Volume' 0" - - # modem_out settings (used if ssp0 is connected to aif2) - cset "name='modem_out mix 0 codec_in0 Switch' off" - cset "name='modem_out mix 0 codec_in1 Switch' off" - cset "name='modem_out mix 0 media_loop1_in Switch' off" - cset "name='modem_out mix 0 media_loop2_in Switch' off" - cset "name='modem_out mix 0 pcm0_in Switch' on" - cset "name='modem_out mix 0 pcm1_in Switch' off" - cset "name='modem_out mix 0 sprot_loop_in Switch' off" - cset "name='modem_out Gain 0 Switch' on" - cset "name='modem_out Gain 0 Volume' 0" - - # input settings - # pcm1_out settings - - # input used when SSP2 is connected - cset "name='codec_in0 Gain 0 Switch' on" - cset "name='codec_in0 Gain 0 Volume' 0" - - # input used when SSP0 is connected - cset "name='modem_in Gain 0 Switch' on" - cset "name='modem_in Gain 0 Volume' 0" - - cset "name='pcm1_out mix 0 codec_in0 Switch' on" - cset "name='pcm1_out mix 0 modem_in Switch' on" - cset "name='pcm1_out mix 0 codec_in1 Switch' off" - cset "name='pcm1_out mix 0 media_loop1_in Switch' off" - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='pcm1_out mix 0 pcm0_in Switch' off" - cset "name='pcm1_out mix 0 pcm1_in Switch' off" - cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - - cset "name='pcm1_out Gain 0 Switch' on" - cset "name='pcm1_out Gain 0 Volume' 0" - - # disable codec_out1 - cset "name='codec_out1 mix 0 codec_in0 Switch' off" - cset "name='codec_out1 mix 0 codec_in1 Switch' off" - cset "name='codec_out1 mix 0 media_loop1_in Switch' off" - cset "name='codec_out1 mix 0 media_loop2_in Switch' off" - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='codec_out1 mix 0 pcm1_in Switch' off" - cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Volume' 0%" - - # disable codec_in1 - cset "name='codec_in1 Gain 0 Switch' off" - cset "name='codec_in1 Gain 0 Volume' 0%" - - # disable all loops - cset "name='media_loop1_out mix 0 codec_in0 Switch' off" - cset "name='media_loop1_out mix 0 codec_in1 Switch' off" - cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop1_out mix 0 pcm0_in Switch' off" - cset "name='media_loop1_out mix 0 pcm1_in Switch' off" - cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - cset "name='media_loop2_out mix 0 codec_in1 Switch' off" - cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 pcm0_in Switch' off" - cset "name='media_loop2_out mix 0 pcm1_in Switch' off" - cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - - cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" - cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" - cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" - cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" - cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" + # Output Configuration cset "name='DAC1 L Mux' IF1 DAC" diff --git a/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf index b5ee2b41..6f5e899c 100644 --- a/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf +++ b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf @@ -29,7 +29,7 @@ cset "name='pcm0_in Gain 0 Volume' 0" cset "name='pcm1_in Gain 0 Switch' off" cset "name='pcm1_in Gain 0 Volume' 0%" -# codec0_out settings (used if SSP2 is connected) +# codec0_out settings (used if SSP2 is connected to aif1) cset "name='codec_out0 mix 0 codec_in0 Switch' off" cset "name='codec_out0 mix 0 codec_in1 Switch' off" cset "name='codec_out0 mix 0 media_loop1_in Switch' off" @@ -40,7 +40,7 @@ cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" cset "name='codec_out0 Gain 0 Switch' on" cset "name='codec_out0 Gain 0 Volume' 0" -# modem_out settings (used if SSP0 is connected) +# modem_out settings (used if SSP0 is connected to aif2) cset "name='modem_out mix 0 codec_in0 Switch' off" cset "name='modem_out mix 0 codec_in1 Switch' off" cset "name='modem_out mix 0 media_loop1_in Switch' off" From patchwork Sun Jan 6 03:47:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Parker X-Patchwork-Id: 10749447 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 2185F14E5 for ; Sun, 6 Jan 2019 03:50:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B7BD28762 for ; Sun, 6 Jan 2019 03:50:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F27F928879; Sun, 6 Jan 2019 03:49:59 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 4E8ED28762 for ; Sun, 6 Jan 2019 03:49:57 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 0BED4267D87; Sun, 6 Jan 2019 04:49:37 +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 CFCB1267AAC; Sun, 6 Jan 2019 04:49:30 +0100 (CET) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by alsa0.perex.cz (Postfix) with ESMTP id 346EC267B69; Sun, 6 Jan 2019 04:49:22 +0100 (CET) Received: by mail-pf1-f196.google.com with SMTP id z9so20164113pfi.2; Sat, 05 Jan 2019 19:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xYxQiYIrApeVilxL8MH2zOtqRbvjw0H4OcfLX67P9BI=; b=P9vko2GaTnwEjLQO55ZoDpqxKWVfXtjr8AzBWDClOTFSQ4x2CpCL8XdBfc1AjmCTuF XJFti31G1sYXZHGiNCzukwFWfRfQ5jDXP/TD0TTSqKhXITT9n6DsgtYBMxd3VjMDbUly HMk3Mgj1YAVueUj2HaRZ9Xr+/2jtmWhUu3Zqh97Yu7+j/z/LeYhtrWicrfgAFjxZaUO5 zqSQHJrzx+JxXO3KGomtlg4H2iA3cxDRInX687nW49tt0EcaE0HNt/cnt8oREwbHJKYD pAboLOGlAF+pA+Yw6nJXK1JE8Q3JSySwmdFoYdnsv5l/SOgz8zc1gBtV34wQih1Q8j4H rpxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xYxQiYIrApeVilxL8MH2zOtqRbvjw0H4OcfLX67P9BI=; b=CmD2ToOXeDPIPR6W1KO3Ufk2aGwVkW+5eIILRb4hKZlQJz9/hOhPL/5Hw5a2QNaAqg zTaeQf23sKjex8eBmO4mxkpER0iX4QMlQmxrr2xG94LlFESyyso3W1yD4tMswnlB+dtV RyoalZa6viv5Uob37c+sCxrcEQOf/ytJL5JDWQ6J+FYnZpwnfW6AACxHmPhedMZ87aU1 Vfmn2IL5X4c12lmDpVSVQJ89OBR4Gte0cij/2bkbi4RBnezfIFS97Q4lNZT5rpXmg9kd 7LEzYkSxNAOjEqqntD0DlfAhy0SkFkeKZd5XIwEDPx2p4GalTABq2T3Rlm6i8Nieo8yz XRHA== X-Gm-Message-State: AJcUukfDv3epDHIjdDvqpyfXdQJD27PhXYTNPOsUjhEuwdXf31G8683w ZZw8SokFh6otZWdZ2h+mVPGrdKRC X-Google-Smtp-Source: ALg8bN46lfKYuLhv+z50CurTLoEvmMwELc2BCmiZX2nPIDUUqMsjZvBfBtPqdIET0y51fewFbCBwMQ== X-Received: by 2002:a63:2263:: with SMTP id t35mr6651207pgm.69.1546746560870; Sat, 05 Jan 2019 19:49:20 -0800 (PST) Received: from localhost.localdomain ([2601:645:4100:ecc5:2f9d:2af4:bdc3:f667]) by smtp.googlemail.com with ESMTPSA id d129sm95235935pfc.31.2019.01.05.19.49.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jan 2019 19:49:20 -0800 (PST) From: russell.parker7@gmail.com To: patch@alsa-project.org Date: Sat, 5 Jan 2019 19:47:12 -0800 Message-Id: <20190106034715.21045-3-russell.parker7@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190106034715.21045-1-russell.parker7@gmail.com> References: <20190106034715.21045-1-russell.parker7@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Russell Parker Subject: [alsa-devel] [PATCH ucm/conf: 2/5] Create shared {En, Dis}ableSeq.conf components for rt5645 variants 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell Parker Factor out the common enable and disable sequences used in rt5645 variants, including the rt5650. Move the sequences into a new compoent directory codecs/rt5645-common/ along with a Makefile. Some lines like cset "name='Stereo1 ADC1 Mux' 1" and cset "name='I2S2 Func Switch' on" are not set set in the chtrt5650 UCM sequences and thus are not present in the new component, in order to maximize reuse. Signed-off-by: Russell Parker diff --git a/configure.ac b/configure.ac index a0392bfe..307e7fc7 100644 --- a/configure.ac +++ b/configure.ac @@ -761,6 +761,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/codecs/Makefile \ src/conf/ucm/codecs/nau8824/Makefile \ src/conf/ucm/codecs/rt5640/Makefile \ + src/conf/ucm/codecs/rt5645-common/Makefile \ src/conf/ucm/codecs/rt5651/Makefile \ src/conf/ucm/platforms/Makefile \ src/conf/ucm/platforms/bytcr/Makefile \ diff --git a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf index 61848358..46508766 100644 --- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf +++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf @@ -12,53 +12,9 @@ SectionVerb { cdev "hw:chtrt5645" + - # Output Configuration - cset "name='DAC1 L Mux' IF1 DAC" - cset "name='DAC1 R Mux' IF1 DAC" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='Stereo DAC MIXL DAC L1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - cset "name='DAC L2 Mux' IF2 DAC" - cset "name='DAC R2 Mux' IF2 DAC" - cset "name='Mono DAC MIXL DAC L2 Switch' on" - cset "name='Mono DAC MIXR DAC R2 Switch' on" - cset "name='DAC2 Playback Switch' on" - - cset "name='HPOVOL MIXL DAC1 Switch' on" - cset "name='HPOVOL MIXR DAC1 Switch' on" - cset "name='HPOVOL MIXL DAC2 Switch' on" - cset "name='HPOVOL MIXR DAC2 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" - cset "name='HPOVOL L Switch' on" - cset "name='HPOVOL R Switch' on" - - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" - cset "name='SPK MIXL DAC L2 Switch' on" - cset "name='SPK MIXR DAC R2 Switch' on" - cset "name='SPOL MIX SPKVOL L Switch' on" - cset "name='SPOR MIX SPKVOL R Switch' on" - cset "name='SPKVOL L Switch' on" - cset "name='SPKVOL R Switch' on" - - # Input Configuration - cset "name='Stereo1 DMIC Mux' 0" cset "name='Stereo1 ADC1 Mux' 1" - cset "name='Stereo1 ADC2 Mux' 1" - cset "name='ADC Capture Switch' on" - # 55/63 - cset "name='ADC Capture Volume' 55" - # set ADC Boost to 0/3, higher vals cause a lot of white noise - cset "name='ADC Boost Capture Volume' 0" - # 55/63 - cset "name='Mono ADC Capture Volume' 55" - # 0/3 - cset "name='Mono ADC Boost Capture Volume' 0" - # 27/31 - cset "name='IN Capture Volume' 27" cset "name='I2S2 Func Switch' on" # 3/12 the headphone mic tends to be quite loud cset "name='IN1 Boost' 3" @@ -69,21 +25,7 @@ SectionVerb { DisableSequence [ cdev "hw:chtrt5645" - # Disable audio output path - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='media0_out mix 0 media1_in Switch' off" - - cset "name='media1_in Gain 0 Switch' off" - cset "name='pcm0_in Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - - # Disable audio input path - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - - cset "name='media_loop2_out Gain 0 Switch' off" - cset "name='pcm1_out Gain 0 Switch' off" - cset "name='codec_in0 Gain 0 Switch' off" + ] } diff --git a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf index d043f685..c16cceac 100644 --- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf +++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf @@ -12,53 +12,9 @@ SectionVerb { cdev "hw:chtrt5645" + - # Output Configuration - cset "name='DAC1 L Mux' IF1 DAC" - cset "name='DAC1 R Mux' IF1 DAC" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='Stereo DAC MIXL DAC L1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - cset "name='DAC L2 Mux' IF2 DAC" - cset "name='DAC R2 Mux' IF2 DAC" - cset "name='Mono DAC MIXL DAC L2 Switch' on" - cset "name='Mono DAC MIXR DAC R2 Switch' on" - cset "name='DAC2 Playback Switch' on" - - cset "name='HPOVOL MIXL DAC1 Switch' on" - cset "name='HPOVOL MIXR DAC1 Switch' on" - cset "name='HPOVOL MIXL DAC2 Switch' on" - cset "name='HPOVOL MIXR DAC2 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" - cset "name='HPOVOL L Switch' on" - cset "name='HPOVOL R Switch' on" - - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" - cset "name='SPK MIXL DAC L2 Switch' on" - cset "name='SPK MIXR DAC R2 Switch' on" - cset "name='SPOL MIX SPKVOL L Switch' on" - cset "name='SPOR MIX SPKVOL R Switch' on" - cset "name='SPKVOL L Switch' on" - cset "name='SPKVOL R Switch' on" - - # Input Configuration - cset "name='Stereo1 DMIC Mux' 0" cset "name='Stereo1 ADC1 Mux' 1" - cset "name='Stereo1 ADC2 Mux' 1" - cset "name='ADC Capture Switch' on" - # 55/63 - cset "name='ADC Capture Volume' 55" - # set ADC Boost to 0/3, higher vals cause a lot of white noise - cset "name='ADC Boost Capture Volume' 0" - # 55/63 - cset "name='Mono ADC Capture Volume' 55" - # 0/3 - cset "name='Mono ADC Boost Capture Volume' 0" - # 27/31 - cset "name='IN Capture Volume' 27" cset "name='I2S2 Func Switch' on" # 3/12 the headphone mic tends to be quite loud cset "name='IN1 Boost' 3" @@ -69,21 +25,7 @@ SectionVerb { DisableSequence [ cdev "hw:chtrt5645" - # Disable audio output path - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='media0_out mix 0 media1_in Switch' off" - - cset "name='media1_in Gain 0 Switch' off" - cset "name='pcm0_in Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - - # Disable audio input path - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - - cset "name='media_loop2_out Gain 0 Switch' off" - cset "name='pcm1_out Gain 0 Switch' off" - cset "name='codec_in0 Gain 0 Switch' off" + ] } diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf index c4452a4e..45cc5186 100644 --- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf +++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf @@ -12,53 +12,9 @@ SectionVerb { cdev "hw:chtrt5645" + - # Output Configuration - cset "name='DAC1 L Mux' IF1 DAC" - cset "name='DAC1 R Mux' IF1 DAC" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='Stereo DAC MIXL DAC L1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - cset "name='DAC L2 Mux' IF2 DAC" - cset "name='DAC R2 Mux' IF2 DAC" - cset "name='Mono DAC MIXL DAC L2 Switch' on" - cset "name='Mono DAC MIXR DAC R2 Switch' on" - cset "name='DAC2 Playback Switch' on" - - cset "name='HPOVOL MIXL DAC1 Switch' on" - cset "name='HPOVOL MIXR DAC1 Switch' on" - cset "name='HPOVOL MIXL DAC2 Switch' on" - cset "name='HPOVOL MIXR DAC2 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" - cset "name='HPOVOL L Switch' on" - cset "name='HPOVOL R Switch' on" - - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" - cset "name='SPK MIXL DAC L2 Switch' on" - cset "name='SPK MIXR DAC R2 Switch' on" - cset "name='SPOL MIX SPKVOL L Switch' on" - cset "name='SPOR MIX SPKVOL R Switch' on" - cset "name='SPKVOL L Switch' on" - cset "name='SPKVOL R Switch' on" - - # Input Configuration - cset "name='Stereo1 DMIC Mux' 0" cset "name='Stereo1 ADC1 Mux' 1" - cset "name='Stereo1 ADC2 Mux' 1" - cset "name='ADC Capture Switch' on" - # 55/63 - cset "name='ADC Capture Volume' 55" - # set ADC Boost to 0/3, higher vals cause a lot of white noise - cset "name='ADC Boost Capture Volume' 0" - # 55/63 - cset "name='Mono ADC Capture Volume' 55" - # 0/3 - cset "name='Mono ADC Boost Capture Volume' 0" - # 27/31 - cset "name='IN Capture Volume' 27" cset "name='I2S2 Func Switch' on" # 3/12 the headphone mic tends to be quite loud cset "name='IN1 Boost' 3" @@ -69,21 +25,7 @@ SectionVerb { DisableSequence [ cdev "hw:chtrt5645" - # Disable audio output path - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='media0_out mix 0 media1_in Switch' off" - - cset "name='media1_in Gain 0 Switch' off" - cset "name='pcm0_in Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - - # Disable audio input path - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - - cset "name='media_loop2_out Gain 0 Switch' off" - cset "name='pcm1_out Gain 0 Switch' off" - cset "name='codec_in0 Gain 0 Switch' off" + ] } diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index 422f3b7e..bc4801d8 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/ucm/chtrt5645/HiFi.conf @@ -1,4 +1,3 @@ - SectionVerb { # ALSA PCM Value { @@ -13,53 +12,9 @@ SectionVerb { cdev "hw:chtrt5645" + - # Output Configuration - cset "name='DAC1 L Mux' IF1 DAC" - cset "name='DAC1 R Mux' IF1 DAC" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='Stereo DAC MIXL DAC L1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - - cset "name='DAC L2 Mux' IF2 DAC" - cset "name='DAC R2 Mux' IF2 DAC" - cset "name='Mono DAC MIXL DAC L2 Switch' on" - cset "name='Mono DAC MIXR DAC R2 Switch' on" - cset "name='DAC2 Playback Switch' on" - - cset "name='HPOVOL MIXL DAC1 Switch' on" - cset "name='HPOVOL MIXR DAC1 Switch' on" - cset "name='HPOVOL MIXL DAC2 Switch' on" - cset "name='HPOVOL MIXR DAC2 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" - cset "name='HPOVOL L Switch' on" - cset "name='HPOVOL R Switch' on" - - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" - cset "name='SPK MIXL DAC L2 Switch' on" - cset "name='SPK MIXR DAC R2 Switch' on" - cset "name='SPOL MIX SPKVOL L Switch' on" - cset "name='SPOR MIX SPKVOL R Switch' on" - cset "name='SPKVOL L Switch' on" - cset "name='SPKVOL R Switch' on" - - # Input Configuration - cset "name='Stereo1 DMIC Mux' 0" cset "name='Stereo1 ADC1 Mux' 1" - cset "name='Stereo1 ADC2 Mux' 1" - cset "name='ADC Capture Switch' on" - # 55/63 - cset "name='ADC Capture Volume' 55" - # set ADC Boost to 0/3, higher vals cause a lot of white noise - cset "name='ADC Boost Capture Volume' 0" - # 55/63 - cset "name='Mono ADC Capture Volume' 55" - # 0/3 - cset "name='Mono ADC Boost Capture Volume' 0" - # 27/31 - cset "name='IN Capture Volume' 27" cset "name='I2S2 Func Switch' on" # 3/12 the headphone mic tends to be quite loud cset "name='IN1 Boost' 3" @@ -70,21 +25,7 @@ SectionVerb { DisableSequence [ cdev "hw:chtrt5645" - # Disable audio output path - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='media0_out mix 0 media1_in Switch' off" - - cset "name='media1_in Gain 0 Switch' off" - cset "name='pcm0_in Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - - # Disable audio input path - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - - cset "name='media_loop2_out Gain 0 Switch' off" - cset "name='pcm1_out Gain 0 Switch' off" - cset "name='codec_in0 Gain 0 Switch' off" + ] } diff --git a/src/conf/ucm/chtrt5650/HiFi.conf b/src/conf/ucm/chtrt5650/HiFi.conf index cc3d64bf..7142dece 100644 --- a/src/conf/ucm/chtrt5650/HiFi.conf +++ b/src/conf/ucm/chtrt5650/HiFi.conf @@ -13,73 +13,19 @@ SectionVerb { cdev "hw:chtrt5650" + - # Output Configuration - cset "name='DAC1 L Mux' IF1 DAC" - cset "name='DAC1 R Mux' IF1 DAC" - cset "name='DAC1 MIXL DAC1 Switch' 1" - cset "name='DAC1 MIXR DAC1 Switch' 1" - cset "name='Stereo DAC MIXL DAC L1 Switch' 1" - cset "name='Stereo DAC MIXR DAC R1 Switch' 1" cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" cset "name='DAC1 Playback Volume' 77,77" - cset "name='Speaker ClassD Playback Volume' 4" - - cset "name='DAC L2 Mux' IF2 DAC" - cset "name='DAC R2 Mux' IF2 DAC" - cset "name='Mono DAC MIXL DAC L2 Switch' on" - cset "name='Mono DAC MIXR DAC R2 Switch' on" - cset "name='DAC2 Playback Switch' on" - - cset "name='HPOVOL MIXL DAC1 Switch' on" - cset "name='HPOVOL MIXR DAC1 Switch' on" - cset "name='HPOVOL MIXL DAC2 Switch' on" - cset "name='HPOVOL MIXR DAC2 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" - cset "name='HPOVOL L Switch' on" - cset "name='HPOVOL R Switch' on" - - cset "name='SPK MIXL DAC L1 Switch' on" - cset "name='SPK MIXR DAC R1 Switch' on" - cset "name='SPK MIXL DAC L2 Switch' on" - cset "name='SPK MIXR DAC R2 Switch' on" - cset "name='SPOL MIX SPKVOL L Switch' on" - cset "name='SPOR MIX SPKVOL R Switch' on" - cset "name='SPKVOL L Switch' on" - cset "name='SPKVOL R Switch' on" - - # Input Configuration - cset "name='Stereo1 DMIC Mux' 0" - cset "name='Stereo1 ADC2 Mux' 1" - cset "name='ADC Capture Switch' on" - cset "name='ADC Capture Volume' 74" - cset "name='ADC Boost Capture Volume' 3" - cset "name='Mono ADC Capture Volume' 74" - cset "name='Mono ADC Boost Capture Volume' 2" - cset "name='IN Capture Volume' 63" - cset "name='RT5650 IF1 ADC Mux' 0" cset "name='I2S2 Func Switch' off" + cset "name='RT5650 IF1 ADC Mux' 0" ] DisableSequence [ cdev "hw:chtrt5650" - # Disable audio output path - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='media0_out mix 0 media1_in Switch' off" - - cset "name='media1_in Gain 0 Switch' off" - cset "name='pcm0_in Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - - # Disable audio input path - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - - cset "name='media_loop2_out Gain 0 Switch' off" - cset "name='pcm1_out Gain 0 Switch' off" - cset "name='codec_in0 Gain 0 Switch' off" + ] } diff --git a/src/conf/ucm/codecs/Makefile.am b/src/conf/ucm/codecs/Makefile.am index 2b374acb..ac1a56dc 100644 --- a/src/conf/ucm/codecs/Makefile.am +++ b/src/conf/ucm/codecs/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS=\ rt5640 \ +rt5645-common \ rt5651 \ nau8824 diff --git a/src/conf/ucm/codecs/rt5645-common/DisableSeq.conf b/src/conf/ucm/codecs/rt5645-common/DisableSeq.conf new file mode 100644 index 00000000..5127d1ae --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/DisableSeq.conf @@ -0,0 +1,15 @@ +# Disable audio output path +cset "name='codec_out1 mix 0 pcm0_in Switch' off" +cset "name='media0_out mix 0 media1_in Switch' off" + +cset "name='media1_in Gain 0 Switch' off" +cset "name='pcm0_in Gain 0 Switch' off" +cset "name='codec_out1 Gain 0 Switch' off" + +# Disable audio input path +cset "name='pcm1_out mix 0 media_loop2_in Switch' off" +cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + +cset "name='media_loop2_out Gain 0 Switch' off" +cset "name='pcm1_out Gain 0 Switch' off" +cset "name='codec_in0 Gain 0 Switch' off" diff --git a/src/conf/ucm/codecs/rt5645-common/EnableSeq.conf b/src/conf/ucm/codecs/rt5645-common/EnableSeq.conf new file mode 100644 index 00000000..d3ad4cf9 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/EnableSeq.conf @@ -0,0 +1,46 @@ +# Output Configuration +cset "name='DAC1 L Mux' IF1 DAC" +cset "name='DAC1 R Mux' IF1 DAC" +cset "name='DAC1 MIXL DAC1 Switch' 1" +cset "name='DAC1 MIXR DAC1 Switch' 1" +cset "name='Stereo DAC MIXL DAC L1 Switch' 1" +cset "name='Stereo DAC MIXR DAC R1 Switch' 1" + +cset "name='DAC L2 Mux' IF2 DAC" +cset "name='DAC R2 Mux' IF2 DAC" +cset "name='Mono DAC MIXL DAC L2 Switch' on" +cset "name='Mono DAC MIXR DAC R2 Switch' on" +cset "name='DAC2 Playback Switch' on" + +cset "name='HPOVOL MIXL DAC1 Switch' on" +cset "name='HPOVOL MIXR DAC1 Switch' on" +cset "name='HPOVOL MIXL DAC2 Switch' on" +cset "name='HPOVOL MIXR DAC2 Switch' on" +cset "name='HPO MIX HPVOL Switch' on" +cset "name='HPOVOL L Switch' on" +cset "name='HPOVOL R Switch' on" + +cset "name='SPK MIXL DAC L1 Switch' on" +cset "name='SPK MIXR DAC R1 Switch' on" +cset "name='SPK MIXL DAC L2 Switch' on" +cset "name='SPK MIXR DAC R2 Switch' on" +cset "name='SPOL MIX SPKVOL L Switch' on" +cset "name='SPOR MIX SPKVOL R Switch' on" +cset "name='SPKVOL L Switch' on" +cset "name='SPKVOL R Switch' on" + +# Input Configuration +cset "name='Stereo1 DMIC Mux' 0" +cset "name='Stereo1 ADC2 Mux' 1" +cset "name='ADC Capture Switch' on" + +# 55/63 +cset "name='ADC Capture Volume' 55" +# set ADC Boost to 0/3, higher vals cause a lot of white noise +cset "name='ADC Boost Capture Volume' 0" +# 55/63 +cset "name='Mono ADC Capture Volume' 55" +# 0/3 +cset "name='Mono ADC Boost Capture Volume' 0" +# 27/31 +cset "name='IN Capture Volume' 27" diff --git a/src/conf/ucm/codecs/rt5645-common/Makefile.am b/src/conf/ucm/codecs/rt5645-common/Makefile.am new file mode 100644 index 00000000..f351fa37 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645-common +ucm_DATA = DisableSeq.conf EnableSeq.conf +EXTRA_DIST = $(ucm_DATA) From patchwork Sun Jan 6 03:47:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Parker X-Patchwork-Id: 10749441 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 0E2D26C5 for ; Sun, 6 Jan 2019 03:49:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED3BC28762 for ; Sun, 6 Jan 2019 03:49:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEDBD28879; Sun, 6 Jan 2019 03:49:34 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 E7BBB28762 for ; Sun, 6 Jan 2019 03:49:33 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C3881267CA9; Sun, 6 Jan 2019 04:49:29 +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 44E0A267C52; Sun, 6 Jan 2019 04:49:27 +0100 (CET) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by alsa0.perex.cz (Postfix) with ESMTP id 855FF267A69; Sun, 6 Jan 2019 04:49:22 +0100 (CET) Received: by mail-pf1-f194.google.com with SMTP id i12so20164364pfo.7; Sat, 05 Jan 2019 19:49:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dFv90TYNe+NYyJSRVog5JPMw5twVlBELq1Lxp5AubY=; b=JruIhhSK+aVzOmfdsJtj5bHzS0/oIf7K1jcjVzpYjjMaDAx8ihvmyMjFWnbDw6bSx4 fNA/vgS/uOJsCBIz/rfwrsXtfFsXqlBdJgZkh8fjGatEJxQlbXgArIW7Tqytmrt43u1Q GnJa6fLtrR61goePjCVbEerqjCilrjOPuNxZxLdogFc84TqvyNVaX2WQeDByjy8aRRkx NbHU4vPa0t3qxmUxOjba6hyij8uPUI93XEdi07ZjZcm9gX4cuO7091esd3ODF4oOGYP5 FGhqykFcgHn3y7O/c2mFHYFvGvXSe5uLYB/JOXfimbuI8s5JqZ8ef/50fcIug7rN9Dis v+KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dFv90TYNe+NYyJSRVog5JPMw5twVlBELq1Lxp5AubY=; b=YBwquGW17J1k5Cp9srRBqHOkSN3iUedzgty0OSiQempYof9TpcMAcO20tGJbPoJPgQ 2LBq6wTtDNhN6USIIYVy5ZcTNp7Utqw7jcwXi6l3EUhlJbgPhO6kSSwBDCxhruzUlFHx DqZC80EKShUUYFeoA06taBZtTu6OthDiwbPjnh5yxeH4aqpV11O7b2tkKTFAECXz0ziM 1P9KHpa1uZTfp11RkFRH2ZK94gsGacTaNPiOtYcDk41CeuPbNZzCe8qHb1GDd7kPzOZ5 iwCjpkZt+72gi6kgURcVM5wgjLc0pTnJO4DLZGtmIrEweRTTuRR4bjdOg2gD3OU9Z+Kb w/xg== X-Gm-Message-State: AJcUukc6wC3l2DBreZhrWO5U7r11y7GiQM53HTwxFPBEcVmGlZM27e9A CiObhYscl+rZPyyArww2DOvPSxU0 X-Google-Smtp-Source: ALg8bN5vlmP5dFX5proEfEbLJxSZu1HiWgXjx1YFKU2xQuaoI8mxpPSAOYRctS7iaIBNH06CWigKDA== X-Received: by 2002:a63:193:: with SMTP id 141mr6709899pgb.136.1546746561660; Sat, 05 Jan 2019 19:49:21 -0800 (PST) Received: from localhost.localdomain ([2601:645:4100:ecc5:2f9d:2af4:bdc3:f667]) by smtp.googlemail.com with ESMTPSA id d129sm95235935pfc.31.2019.01.05.19.49.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jan 2019 19:49:21 -0800 (PST) From: russell.parker7@gmail.com To: patch@alsa-project.org Date: Sat, 5 Jan 2019 19:47:13 -0800 Message-Id: <20190106034715.21045-4-russell.parker7@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190106034715.21045-1-russell.parker7@gmail.com> References: <20190106034715.21045-1-russell.parker7@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Russell Parker Subject: [alsa-devel] [PATCH ucm/conf: 3/5] Factor out rt5645 variants Speaker+Headphones shared UCM enable sequences 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell Parker Move common enable sequences for rt5645 variants and rt5650 UCM configuratons into a shared component. The corresponding disable sequences are only two lines each and do not seem worth creating components for. Signed-off-by: Russell Parker diff --git a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf index 46508766..9616be27 100644 --- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf +++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf @@ -43,12 +43,7 @@ SectionDevice."Speaker" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - - cset "name='Ext Spk Switch' on" - cset "name='Speaker Channel Switch' on" - cset "name='Speaker Playback Volume' 31" + ] DisableSequence [ @@ -75,13 +70,7 @@ SectionDevice."Headphones" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - - cset "name='Headphone Switch' on" - cset "name='Headphone Channel Switch' on" - # 25/39 higher values cause crackling on some boards - cset "name='Headphone Playback Volume' 25" + ] DisableSequence [ diff --git a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf index c16cceac..eda1272a 100644 --- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf +++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf @@ -43,12 +43,7 @@ SectionDevice."Speaker" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - - cset "name='Ext Spk Switch' on" - cset "name='Speaker Channel Switch' on" - cset "name='Speaker Playback Volume' 31" + ] DisableSequence [ @@ -75,13 +70,7 @@ SectionDevice."Headphones" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - - cset "name='Headphone Switch' on" - cset "name='Headphone Channel Switch' on" - # 25/39 higher values cause crackling on some boards - cset "name='Headphone Playback Volume' 25" + ] DisableSequence [ diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf index 45cc5186..0e868e26 100644 --- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf +++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf @@ -47,12 +47,7 @@ SectionDevice."Speaker" { cset "name='Stereo DAC MIXL DAC R1 Switch' 1" cset "name='Stereo DAC MIXR DAC R1 Switch' 0" - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - - cset "name='Ext Spk Switch' on" - cset "name='Speaker Channel Switch' on" - cset "name='Speaker Playback Volume' 31" + ] DisableSequence [ @@ -83,13 +78,7 @@ SectionDevice."Headphones" { cset "name='Stereo DAC MIXL DAC R1 Switch' 0" cset "name='Stereo DAC MIXR DAC R1 Switch' 1" - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - - cset "name='Headphone Switch' on" - cset "name='Headphone Channel Switch' on" - # 25/39 higher values cause crackling on some boards - cset "name='Headphone Playback Volume' 25" + ] DisableSequence [ diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index bc4801d8..1bb9830d 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/ucm/chtrt5645/HiFi.conf @@ -43,12 +43,7 @@ SectionDevice."Speaker" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - - cset "name='Ext Spk Switch' on" - cset "name='Speaker Channel Switch' on" - cset "name='Speaker Playback Volume' 31" + ] DisableSequence [ @@ -75,13 +70,7 @@ SectionDevice."Headphones" { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - - cset "name='Headphone Switch' on" - cset "name='Headphone Channel Switch' on" - # 25/39 higher values cause crackling on some boards - cset "name='Headphone Playback Volume' 25" + ] DisableSequence [ diff --git a/src/conf/ucm/chtrt5650/HiFi.conf b/src/conf/ucm/chtrt5650/HiFi.conf index 7142dece..c8bd397a 100644 --- a/src/conf/ucm/chtrt5650/HiFi.conf +++ b/src/conf/ucm/chtrt5650/HiFi.conf @@ -43,12 +43,7 @@ SectionDevice."Speaker" { EnableSequence [ cdev "hw:chtrt5650" - cset "name='Headphone Switch' off" - cset "name='Headphone Channel Switch' off" - - cset "name='Ext Spk Switch' on" - cset "name='Speaker Channel Switch' on" - cset "name='Speaker Playback Volume' 31" + ] DisableSequence [ @@ -75,12 +70,7 @@ SectionDevice."Headphones" { EnableSequence [ cdev "hw:chtrt5650" - cset "name='Ext Spk Switch' off" - cset "name='Speaker Channel Switch' off" - - cset "name='Headphone Switch' on" - cset "name='Headphone Channel Switch' on" - cset "name='Headphone Playback Volume' 31" + ] DisableSequence [ diff --git a/src/conf/ucm/codecs/rt5645-common/HeadphonesEnableSeq.conf b/src/conf/ucm/codecs/rt5645-common/HeadphonesEnableSeq.conf new file mode 100644 index 00000000..6c231da7 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/HeadphonesEnableSeq.conf @@ -0,0 +1,7 @@ +cset "name='Ext Spk Switch' off" +cset "name='Speaker Channel Switch' off" + +cset "name='Headphone Switch' on" +cset "name='Headphone Channel Switch' on" +# 25/39 higher values cause crackling on some boards +cset "name='Headphone Playback Volume' 25" diff --git a/src/conf/ucm/codecs/rt5645-common/Makefile.am b/src/conf/ucm/codecs/rt5645-common/Makefile.am index f351fa37..7eff2e72 100644 --- a/src/conf/ucm/codecs/rt5645-common/Makefile.am +++ b/src/conf/ucm/codecs/rt5645-common/Makefile.am @@ -1,4 +1,5 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645-common -ucm_DATA = DisableSeq.conf EnableSeq.conf +ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \ + SpeakerEnableSeq.conf EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/codecs/rt5645-common/SpeakerEnableSeq.conf b/src/conf/ucm/codecs/rt5645-common/SpeakerEnableSeq.conf new file mode 100644 index 00000000..2cc62fc5 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/SpeakerEnableSeq.conf @@ -0,0 +1,6 @@ +cset "name='Headphone Switch' off" +cset "name='Headphone Channel Switch' off" + +cset "name='Ext Spk Switch' on" +cset "name='Speaker Channel Switch' on" +cset "name='Speaker Playback Volume' 31" From patchwork Sun Jan 6 03:47:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Parker X-Patchwork-Id: 10749443 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 DAA9E13BF for ; Sun, 6 Jan 2019 03:49:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C776028762 for ; Sun, 6 Jan 2019 03:49:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB9D828879; Sun, 6 Jan 2019 03:49:42 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 9331A28762 for ; Sun, 6 Jan 2019 03:49:41 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 21049267CA3; Sun, 6 Jan 2019 04:49:32 +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 E39E3267CDF; Sun, 6 Jan 2019 04:49:29 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by alsa0.perex.cz (Postfix) with ESMTP id 36EB2267B6A; Sun, 6 Jan 2019 04:49:23 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id g9so19236050plo.3; Sat, 05 Jan 2019 19:49:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2su5pd6jung70ip0M9e6Bsqf7zeYXvrzuxKo2HHusZk=; b=Tr4O9CbORgZQoL9Ne/V/7tBqfj3IwDmi1b2nSJhsPFOCxAbM3UR/4jADmDYW+8zvx8 YxpV0isFDnKk0/zUMxwLc2XnsWYuqMd/j8Z5PIwrYW82FNXA2fPEjp+/8D8asv5Ypklj ZvTOLKkUZcwNR1QL8Kk4RdsnD2IU/cDc+Vw+9TuPY9w5nsoX2fd50pZh8qUtxj00DJv8 AD1vomME4rSkwu/yFu6wK+h3xTFADwwahx4moCoa9zybX63xPlz4tv/QSnXqWo0tHJmq 2KAGFRlM7fuOLc4ELn19XxqD1f7p32RBmw+A2JvxXaLgFTRVIJs7eS52H2oJnl3mJVwh Li1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2su5pd6jung70ip0M9e6Bsqf7zeYXvrzuxKo2HHusZk=; b=hmydSQiZIPUt6nWoEqyS9W3UAfgdoDWhReFPlnZT91URbgHQrEzxHgql3kMf6NYknH dRfI1zUq0tI63GrNZH15rjhZByVlO0vAOdc2eNHW5giCg7OlCAyyM3LNNb78Xd+R+Abo 82jtYMUSr6ShA7AKzBWGP/FR6s2fUbQzG6a21O85aIHUgbxYMhKYgRL20XCg6OGHeQ5j yO7HsOwWgJWRu8vkYyygGIYaouhSuGnlmWGwWHqn/N4G50u38UnsGHr5q5bSLbLseaSK Gsjj9vaY3XzZ7lMVd9mqRPawwumiwO81Z6aZKad8xbKl+AJ5taohDXmsMIUMeJL1Nwdc bffA== X-Gm-Message-State: AJcUukcUT/Ij3gvEQtwD0K3RJJpIsFiS4PFH0Z2TlTdsAxSx4ao5u2/H Mk5vRZOWIwSAmwQOb9uMxEaLJff/ X-Google-Smtp-Source: ALg8bN5caMaXaRK7upCAi/FiAg1vMT2IZwZC3BnYqlv2bZ4AkRWe2w8f/tLxlJUUbPbpXG4jMVeUVA== X-Received: by 2002:a17:902:45:: with SMTP id 63mr54607048pla.272.1546746562378; Sat, 05 Jan 2019 19:49:22 -0800 (PST) Received: from localhost.localdomain ([2601:645:4100:ecc5:2f9d:2af4:bdc3:f667]) by smtp.googlemail.com with ESMTPSA id d129sm95235935pfc.31.2019.01.05.19.49.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jan 2019 19:49:21 -0800 (PST) From: russell.parker7@gmail.com To: patch@alsa-project.org Date: Sat, 5 Jan 2019 19:47:14 -0800 Message-Id: <20190106034715.21045-5-russell.parker7@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190106034715.21045-1-russell.parker7@gmail.com> References: <20190106034715.21045-1-russell.parker7@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Russell Parker Subject: [alsa-devel] [PATCH ucm/conf: 4/5] Factor out rt5645 variants Headset+Digital Mic UCM shared {en, dis}able sequences 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell Parker Signed-off-by: Russell Parker diff --git a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf index 9616be27..e080e383 100644 --- a/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf +++ b/src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/HiFi.conf @@ -92,31 +92,18 @@ SectionDevice."DMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Int Mic Switch' on" + cset "name='Stereo1 DMIC Mux' DMIC1" cset "name='Stereo1 ADC2 Mux' DMIC" cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC" - - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" - cset "name='Sto1 ADC MIXL ADC2 Switch' on" - cset "name='Sto1 ADC MIXR ADC2 Switch' on" - cset "name='Mono ADC MIXL ADC1 Switch' off" - cset "name='Mono ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC MIXL ADC2 Switch' on" - cset "name='Mono ADC MIXR ADC2 Switch' on" ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - cset "name='Int Mic Switch' off" + ] } @@ -132,10 +119,8 @@ SectionDevice."HSMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' on" + - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -143,23 +128,14 @@ SectionDevice."HSMic".0 { cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST1 Switch' on" - cset "name='RECMIXR BST1 Switch' on" - ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' off" + - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - ] } diff --git a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf index eda1272a..714f4597 100644 --- a/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf +++ b/src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf @@ -92,7 +92,7 @@ SectionDevice."DMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Int Mic Switch' on" + cset "name='Stereo1 DMIC Mux' DMIC2" cset "name='Stereo1 ADC2 Mux' DMIC" @@ -100,25 +100,12 @@ SectionDevice."DMic".0 { cset "name='Mono DMIC R Mux' DMIC2" cset "name='Mono ADC L2 Mux' DMIC" cset "name='Mono ADC R2 Mux' DMIC" - - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" - cset "name='Sto1 ADC MIXL ADC2 Switch' on" - cset "name='Sto1 ADC MIXR ADC2 Switch' on" - cset "name='Mono ADC MIXL ADC1 Switch' off" - cset "name='Mono ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC MIXL ADC2 Switch' on" - cset "name='Mono ADC MIXR ADC2 Switch' on" ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - cset "name='Int Mic Switch' off" + ] } @@ -134,10 +121,8 @@ SectionDevice."HSMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' on" + - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -145,23 +130,14 @@ SectionDevice."HSMic".0 { cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST1 Switch' on" - cset "name='RECMIXR BST1 Switch' on" - ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' off" + - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - ] } diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf index 0e868e26..489390d5 100644 --- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf +++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf @@ -145,10 +145,8 @@ SectionDevice."HSMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' on" + - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -156,23 +154,14 @@ SectionDevice."HSMic".0 { cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST1 Switch' on" - cset "name='RECMIXR BST1 Switch' on" - ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' off" + - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - ] } diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index 1bb9830d..ac5f60e2 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/ucm/chtrt5645/HiFi.conf @@ -136,10 +136,8 @@ SectionDevice."HSMic".0 { EnableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' on" + - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" cset "name='Sto1 ADC MIXL ADC2 Switch' off" cset "name='Sto1 ADC MIXR ADC2 Switch' off" @@ -147,23 +145,14 @@ SectionDevice."HSMic".0 { cset "name='Mono ADC MIXR ADC1 Switch' on" cset "name='Mono ADC MIXL ADC2 Switch' off" cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST1 Switch' on" - cset "name='RECMIXR BST1 Switch' on" - ] DisableSequence [ cdev "hw:chtrt5645" - cset "name='Headset Mic Switch' off" + - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" cset "name='Mono ADC MIXL ADC1 Switch' on" cset "name='Mono ADC MIXR ADC1 Switch' on" - ] } diff --git a/src/conf/ucm/chtrt5650/HiFi.conf b/src/conf/ucm/chtrt5650/HiFi.conf index c8bd397a..641dbc34 100644 --- a/src/conf/ucm/chtrt5650/HiFi.conf +++ b/src/conf/ucm/chtrt5650/HiFi.conf @@ -118,22 +118,16 @@ SectionDevice."HSMic".0 { EnableSequence [ cdev "hw:chtrt5650" - cset "name='Headset Mic Switch' on" - cset "name='RECMIXL BST1 Switch' on" - cset "name='RECMIXR BST1 Switch' on" - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" + + cset "name='IN1 Boost' 1" ] DisableSequence [ cdev "hw:chtrt5650" - cset "name='Headset Mic Switch' off" - cset "name='RECMIXL BST1 Switch' off" - cset "name='RECMIXR BST1 Switch' off" - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" + + cset "name='IN1 Boost' 0" ] } diff --git a/src/conf/ucm/codecs/rt5645-common/DigitalMicDisableSeq.conf b/src/conf/ucm/codecs/rt5645-common/DigitalMicDisableSeq.conf new file mode 100644 index 00000000..751f38c0 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/DigitalMicDisableSeq.conf @@ -0,0 +1,5 @@ +cset "name='Sto1 ADC MIXL ADC2 Switch' off" +cset "name='Sto1 ADC MIXR ADC2 Switch' off" +cset "name='Mono ADC MIXL ADC2 Switch' off" +cset "name='Mono ADC MIXR ADC2 Switch' off" +cset "name='Int Mic Switch' off" diff --git a/src/conf/ucm/codecs/rt5645-common/DigitalMicEnableSeq.conf b/src/conf/ucm/codecs/rt5645-common/DigitalMicEnableSeq.conf new file mode 100644 index 00000000..cb243b33 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/DigitalMicEnableSeq.conf @@ -0,0 +1,10 @@ +cset "name='Int Mic Switch' on" + +cset "name='Sto1 ADC MIXL ADC1 Switch' off" +cset "name='Sto1 ADC MIXR ADC1 Switch' off" +cset "name='Sto1 ADC MIXL ADC2 Switch' on" +cset "name='Sto1 ADC MIXR ADC2 Switch' on" +cset "name='Mono ADC MIXL ADC1 Switch' off" +cset "name='Mono ADC MIXR ADC1 Switch' off" +cset "name='Mono ADC MIXL ADC2 Switch' on" +cset "name='Mono ADC MIXR ADC2 Switch' on" diff --git a/src/conf/ucm/codecs/rt5645-common/HSMicDisableSeq.conf b/src/conf/ucm/codecs/rt5645-common/HSMicDisableSeq.conf new file mode 100644 index 00000000..ef42b176 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/HSMicDisableSeq.conf @@ -0,0 +1,6 @@ +cset "name='Headset Mic Switch' off" + +cset "name='RECMIXL BST1 Switch' off" +cset "name='RECMIXR BST1 Switch' off" +cset "name='Sto1 ADC MIXL ADC1 Switch' off" +cset "name='Sto1 ADC MIXR ADC1 Switch' off" diff --git a/src/conf/ucm/codecs/rt5645-common/HSMicEnableSeq.conf b/src/conf/ucm/codecs/rt5645-common/HSMicEnableSeq.conf new file mode 100644 index 00000000..6c26d687 --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/HSMicEnableSeq.conf @@ -0,0 +1,7 @@ +cset "name='Headset Mic Switch' on" + +cset "name='Sto1 ADC MIXL ADC1 Switch' on" +cset "name='Sto1 ADC MIXR ADC1 Switch' on" + +cset "name='RECMIXL BST1 Switch' on" +cset "name='RECMIXR BST1 Switch' on" diff --git a/src/conf/ucm/codecs/rt5645-common/Makefile.am b/src/conf/ucm/codecs/rt5645-common/Makefile.am index 7eff2e72..06403d9b 100644 --- a/src/conf/ucm/codecs/rt5645-common/Makefile.am +++ b/src/conf/ucm/codecs/rt5645-common/Makefile.am @@ -1,5 +1,7 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645-common ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \ - SpeakerEnableSeq.conf + SpeakerEnableSeq.conf DigitalMicDisableSeq.conf \ + DigitalMicEnableSeq.conf HSMicDisableSeq.conf \ + HSMicEnableSeq.conf EXTRA_DIST = $(ucm_DATA) From patchwork Sun Jan 6 03:47:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell Parker X-Patchwork-Id: 10749445 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 805EA14E2 for ; Sun, 6 Jan 2019 03:49:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DE0428762 for ; Sun, 6 Jan 2019 03:49:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6229D28879; Sun, 6 Jan 2019 03:49:50 +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.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 9014F28762 for ; Sun, 6 Jan 2019 03:49:49 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 96590267D66; Sun, 6 Jan 2019 04:49:33 +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 230E9267D62; Sun, 6 Jan 2019 04:49:30 +0100 (CET) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by alsa0.perex.cz (Postfix) with ESMTP id 81578267B71; Sun, 6 Jan 2019 04:49:24 +0100 (CET) Received: by mail-pl1-f193.google.com with SMTP id e11so19235634plt.11; Sat, 05 Jan 2019 19:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ja+r73k2wnjNtvTak40aKLUXNcO/0nZMJLJ02ZwOdJs=; b=uHoFFd7+ShmstEfaZrgPjcsAP2pYto9b8rX5ltcoN8OUaHlfs3O/Am7Oshke0aqORF xbOL39nO5fWXEtiGDQj/eUpeAk90X6tZFpLGxbFZ8HSBhyBrRtpS0zN9zQ2+uuEk4VQ/ oTYwdFjnU4cHu91l2LNzUKQdP+e1LHy+a0p9QZa0lls63R5BhBmitBI97Yy/EPtDVkn1 6ULEmCZCykpG6omkvfYwI4hC1FX2z8QjMPPmtJThDUkd1MJBVnJOaaZIqqupM66YV07T IKyy8PUepBYKXjFx4CkfHjZGo4ZTovcJ9Bvo96mW31nuo7agljkIrMAjqbbu2JQjAPib C5wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ja+r73k2wnjNtvTak40aKLUXNcO/0nZMJLJ02ZwOdJs=; b=r+HlZiibFSHFCn+5cZ4shtvdVcWjztdauGtr1B854+yeyvtyIB2/LWcl/sXh8g/p+m 1ftn48a45TU1EXyhEcOgIdmA0HA5xa+hQqFtoOmbU3aNetD40evTZJrH/rakHfcmTfGS LpQQOYi3KORc0o8zh22jbHQjrCl7VNUOxXluaut38kbIPMIc0BOZt9MEy4WIfQ16Flvb WTSMLFs4EJ/KdkJmN9v+mly6IK3zIdRUYiFFvGxx9pQIgYSwEBS69TIeBCBvQlPSiaPC KFaUJbJlLn+LtsCjI+Wb1BlaBS6wWRfZp9GchT1hFws1qqtCuhGCbTCMGXpa2e6cj6tY NCkg== X-Gm-Message-State: AJcUukd85Dpd8DvONBb0nmurEKPZfg2JrLWkmDbtMerkbCoYrFAqo+0K FotSnomIHYd02qsGJiZlXKO8AstW X-Google-Smtp-Source: ALg8bN5Qz019l3EjFRuMnU2yPfKd32XClDs//zJ6/S4fymDFjcPfIrHYFkaGjc/F0DvdIrsd1x2rSQ== X-Received: by 2002:a17:902:b68d:: with SMTP id c13mr56472604pls.102.1546746563068; Sat, 05 Jan 2019 19:49:23 -0800 (PST) Received: from localhost.localdomain ([2601:645:4100:ecc5:2f9d:2af4:bdc3:f667]) by smtp.googlemail.com with ESMTPSA id d129sm95235935pfc.31.2019.01.05.19.49.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Jan 2019 19:49:22 -0800 (PST) From: russell.parker7@gmail.com To: patch@alsa-project.org Date: Sat, 5 Jan 2019 19:47:15 -0800 Message-Id: <20190106034715.21045-6-russell.parker7@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190106034715.21045-1-russell.parker7@gmail.com> References: <20190106034715.21045-1-russell.parker7@gmail.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Russell Parker Subject: [alsa-devel] [PATCH ucm/conf: 5/5] Create device comoponent for rt5645 Internal Analog Mic UCM 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Russell Parker Since the Internal Analog Microphone device configuration is identical for the rt5645 and rt5645 mono speaker UCMs, move the entire definition to a component. Signed-off-by: Russell Parker diff --git a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf index 489390d5..8497fa66 100644 --- a/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf +++ b/src/conf/ucm/chtrt5645-mono-speaker-analog-mic/HiFi.conf @@ -89,49 +89,7 @@ SectionDevice."Headphones" { ] } -SectionDevice."Mic".0 { - Comment "Internal Analog Microphone" - - Value { - CaptureChannels "2" - CapturePriority "150" - } - - EnableSequence [ - cdev "hw:chtrt5645" - - cset "name='Int Analog Mic Switch' on" - - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST2 Switch' on" - cset "name='RECMIXR BST2 Switch' on" - - ] - - DisableSequence [ - cdev "hw:chtrt5645" - - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC MIXL ADC1 Switch' off" - cset "name='Mono ADC MIXR ADC1 Switch' off" - - cset "name='RECMIXL BST2 Switch' off" - cset "name='RECMIXR BST2 Switch' off" - - cset "name='Int Analog Mic Switch' off" - ] -} - + SectionDevice."HSMic".0 { Comment "Headset Microphone" diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index ac5f60e2..b98ae66f 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/ucm/chtrt5645/HiFi.conf @@ -81,48 +81,7 @@ SectionDevice."Headphones" { ] } -SectionDevice."Mic".0 { - Comment "Internal Analog Microphone" - - Value { - CaptureChannels "2" - CapturePriority "150" - } - - EnableSequence [ - cdev "hw:chtrt5645" - - cset "name='Int Analog Mic Switch' on" - - cset "name='Sto1 ADC MIXL ADC1 Switch' on" - cset "name='Sto1 ADC MIXR ADC1 Switch' on" - cset "name='Sto1 ADC MIXL ADC2 Switch' off" - cset "name='Sto1 ADC MIXR ADC2 Switch' off" - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" - cset "name='Mono ADC MIXL ADC2 Switch' off" - cset "name='Mono ADC MIXR ADC2 Switch' off" - - cset "name='RECMIXL BST2 Switch' on" - cset "name='RECMIXR BST2 Switch' on" - - ] - - DisableSequence [ - cdev "hw:chtrt5645" - - cset "name='Sto1 ADC MIXL ADC1 Switch' off" - cset "name='Sto1 ADC MIXR ADC1 Switch' off" - cset "name='Mono ADC MIXL ADC1 Switch' off" - cset "name='Mono ADC MIXR ADC1 Switch' off" - - cset "name='RECMIXL BST2 Switch' off" - cset "name='RECMIXR BST2 Switch' off" - - cset "name='Int Analog Mic Switch' off" - ] -} + SectionDevice."HSMic".0 { Comment "Headset Microphone" diff --git a/src/conf/ucm/codecs/rt5645-common/AnalogMic.conf b/src/conf/ucm/codecs/rt5645-common/AnalogMic.conf new file mode 100644 index 00000000..cbcefa7a --- /dev/null +++ b/src/conf/ucm/codecs/rt5645-common/AnalogMic.conf @@ -0,0 +1,41 @@ +SectionDevice."Mic".0 { + Comment "Internal Analog Microphone" + + Value { + CaptureChannels "2" + CapturePriority "150" + } + + EnableSequence [ + cdev "hw:chtrt5645" + + cset "name='Int Analog Mic Switch' on" + + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + + cset "name='Mono ADC MIXL ADC1 Switch' on" + cset "name='Mono ADC MIXR ADC1 Switch' on" + cset "name='Mono ADC MIXL ADC2 Switch' off" + cset "name='Mono ADC MIXR ADC2 Switch' off" + + cset "name='RECMIXL BST2 Switch' on" + cset "name='RECMIXR BST2 Switch' on" + ] + + DisableSequence [ + cdev "hw:chtrt5645" + + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='Mono ADC MIXL ADC1 Switch' off" + cset "name='Mono ADC MIXR ADC1 Switch' off" + + cset "name='RECMIXL BST2 Switch' off" + cset "name='RECMIXR BST2 Switch' off" + + cset "name='Int Analog Mic Switch' off" + ] +} diff --git a/src/conf/ucm/codecs/rt5645-common/Makefile.am b/src/conf/ucm/codecs/rt5645-common/Makefile.am index 06403d9b..75924b40 100644 --- a/src/conf/ucm/codecs/rt5645-common/Makefile.am +++ b/src/conf/ucm/codecs/rt5645-common/Makefile.am @@ -3,5 +3,5 @@ ucmdir = $(alsaconfigdir)/ucm/codecs/rt5645-common ucm_DATA = DisableSeq.conf EnableSeq.conf HeadphonesEnableSeq.conf \ SpeakerEnableSeq.conf DigitalMicDisableSeq.conf \ DigitalMicEnableSeq.conf HSMicDisableSeq.conf \ - HSMicEnableSeq.conf + HSMicEnableSeq.conf AnalogMic.conf EXTRA_DIST = $(ucm_DATA)