From patchwork Tue Jan 14 11:21:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 193865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8C5FC33CB1 for ; Tue, 14 Jan 2020 13:22:19 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F08A24680 for ; Tue, 14 Jan 2020 13:22:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="M/g8E33y" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F08A24680 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gerhold.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (unknown [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6BE522E91; Tue, 14 Jan 2020 12:23:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6BE522E91 Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 44A43F8021E; Tue, 14 Jan 2020 12:23:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 313ECF8026F; Tue, 14 Jan 2020 12:23:02 +0100 (CET) Received: from mo6-p01-ob.smtp.rzone.de (mo6-p01-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5301::5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C3CC8F80121; Tue, 14 Jan 2020 12:22:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C3CC8F80121 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="M/g8E33y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1579000975; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=X+OWkKL+QIgQaAWCoXnWN108mmrFk+pANvEAC/RGGmI=; b=M/g8E33yR9spmYHy3Y1OF8AXE5VL/SI3xxSdLdPvFexS2Hw3FJ1yNAV+tUfFbHBzNx fgIJZciv+NpG8pAELLv9nbrT240z8YUk43pmxnQ8ciy8hwG1/W4N0xYqdz+EjXl4SrPu 5U8tINyqbasvukVTR0evUPFwfRqc6ewnVONKVPbIMY3WjYi5FVl/B08f8MXmtPH4duS7 EXGYfkvT9euKe911GAl8EmOkmW2B64jR5MqcN0O0cdLOiTybxy8NRgsejt+JbdL8rFnh 251u0Sl6O22HKRbA5InzWpW+PLXHUaG/OjyoVaZs5kFLasChbdfLToiKWslnPtA449es EYfw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXQ7IOGU5qzCB3a93viaVr" X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain by smtp.strato.de (RZmta 46.1.4 AUTH) with ESMTPSA id h048a6w0EBMsULA (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 14 Jan 2020 12:22:54 +0100 (CET) From: Stephan Gerhold To: Jaroslav Kysela Date: Tue, 14 Jan 2020 12:21:04 +0100 Message-Id: <20200114112110.51983-2-stephan@gerhold.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114112110.51983-1-stephan@gerhold.net> References: <20200114112110.51983-1-stephan@gerhold.net> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, patch@alsa-project.org, Srinivas Kandagatla , Stephan Gerhold Subject: [alsa-devel] [PATCH alsa-ucm-conf 1/7] DB410c: Rename Handset to HeadsetMic X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" The "Handset" device actually configures the headset microphone, as indicated in the comment. The actual "Handset" microphone used for voice calls is usually internal and connected to PrimaryMic. Rename the current "Handset" device to "HeadsetMic" for clarity. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/DB410c/HiFi.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucm2/DB410c/HiFi.conf b/ucm2/DB410c/HiFi.conf index 848d02f..a0ef42c 100644 --- a/ucm2/DB410c/HiFi.conf +++ b/ucm2/DB410c/HiFi.conf @@ -75,7 +75,7 @@ SectionDevice."Earpiece" { ] } -SectionDevice."Handset" { +SectionDevice."HeadsetMic" { Comment "Headset Microphone" EnableSequence [ From patchwork Tue Jan 14 11:21:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 193864 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AD55C33CB1 for ; Tue, 14 Jan 2020 13:22:37 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 918F720678 for ; Tue, 14 Jan 2020 13:22:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="aRf6Qgc9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 918F720678 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gerhold.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (unknown [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6D8272F1B; Tue, 14 Jan 2020 12:26:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6D8272F1B Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 38411F8028A; Tue, 14 Jan 2020 12:23:16 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1025BF80276; Tue, 14 Jan 2020 12:23:10 +0100 (CET) Received: from mo6-p01-ob.smtp.rzone.de (mo6-p01-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5301::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 59F91F8016F; Tue, 14 Jan 2020 12:22:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 59F91F8016F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="aRf6Qgc9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1579000975; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=L+8ky1yIDg/H2S1NbVCrXsVVmbdReTNhzWO7np4SWfY=; b=aRf6Qgc9ndbIwJmKQ9o8ZtF6SE5fZArEvvWoTE29Gr01ydGn0bokt55GFBjxFP+pw8 oo511aSDyfbTxecGB/epByI020OGN5ZLOScvNPwYPrVVfcomyTKPVKXI72Z/ffC1mbsP /mAgCPZ9ik4r1okv351u+pbgBctx/GshdmKc2eo2vUs+ilslZhpKROg14VoKrizvmW/J DtajcRVUtKvHlR2O+D7TMtgDzQrhxtrpW9HaGa9rdS261fAuKUQJY9ANAjQ1FExJHu7s tat7SQoLIliolaMEo01poAuiWO6Fkz55hJwEE+COqxmDiIgh3rOGI26dQm3oyNAG/Zlr MQmg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXQ7IOGU5qzCB3a93viaVr" X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain by smtp.strato.de (RZmta 46.1.4 AUTH) with ESMTPSA id h048a6w0EBMsULD (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 14 Jan 2020 12:22:54 +0100 (CET) From: Stephan Gerhold To: Jaroslav Kysela Date: Tue, 14 Jan 2020 12:21:06 +0100 Message-Id: <20200114112110.51983-4-stephan@gerhold.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114112110.51983-1-stephan@gerhold.net> References: <20200114112110.51983-1-stephan@gerhold.net> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, patch@alsa-project.org, Srinivas Kandagatla , Stephan Gerhold Subject: [alsa-devel] [PATCH alsa-ucm-conf 3/7] codecs/msm8916-wcd: Speaker: Reset volume on disable X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" For Headphones we reset the Digital Volume back to 0 when disabling the device; do the same for the Speaker. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/codecs/msm8916-wcd/Speaker.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/ucm2/codecs/msm8916-wcd/Speaker.conf b/ucm2/codecs/msm8916-wcd/Speaker.conf index 2b1dd8a..1e0dfa6 100644 --- a/ucm2/codecs/msm8916-wcd/Speaker.conf +++ b/ucm2/codecs/msm8916-wcd/Speaker.conf @@ -14,6 +14,7 @@ SectionDevice."Speaker" { ] DisableSequence [ + cset "name='RX3 Digital Volume' 0" cset "name='SPK DAC Switch' 0" cset "name='RX3 MIX1 INP1' ZERO" ] From patchwork Tue Jan 14 11:21:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 193877 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A5FEC33CB1 for ; Tue, 14 Jan 2020 13:16:03 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0956624676 for ; Tue, 14 Jan 2020 13:16:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="ITpgSGCJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0956624676 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gerhold.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (unknown [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 46B3A2644; Tue, 14 Jan 2020 12:25:38 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 46B3A2644 Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 141FCF8027B; Tue, 14 Jan 2020 12:23:15 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A9B82F80277; Tue, 14 Jan 2020 12:23:09 +0100 (CET) Received: from mo6-p02-ob.smtp.rzone.de (mo6-p02-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5302::5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 466F6F80171; Tue, 14 Jan 2020 12:22:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 466F6F80171 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="ITpgSGCJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1579000976; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=wHoJ/wPFOHNOLp15KZ+GLTWKe4KtsJJ+wXC+HluvpnE=; b=ITpgSGCJXE3CgzLZ7FhvdDTbQy4Q3biZeEelX7a4DEfQBZz3TOIfK0Ww15yN2maB4/ uidck2D4BYuVCUPD4Wmly9eGNohEPUctyntxeRiUGcfneQ99ENPE/iaNfTmy5wZXhAGL PQ0h0OYBxS5GVteckioKVcaRdPqMoukc8VDaQedpeh2Nk0IJuXfmEMytFMDKiX58c6cu 1r6EwshMWJUmmNpgUHHDDLp0C3UzATKtgNCvuOmdrsyXNyO1NUyWpdl8SJt5WCmoMy5r Eg0vcZ33+9uCWBGZWgM5w1UhdMbQOj7+mF2uCDZcqWiNInv4ODNkA3vjWocBYkOk4iRg QE7g== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXQ7IOGU5qzCB3a93viaVr" X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain by smtp.strato.de (RZmta 46.1.4 AUTH) with ESMTPSA id h048a6w0EBMtULF (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 14 Jan 2020 12:22:55 +0100 (CET) From: Stephan Gerhold To: Jaroslav Kysela Date: Tue, 14 Jan 2020 12:21:08 +0100 Message-Id: <20200114112110.51983-6-stephan@gerhold.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114112110.51983-1-stephan@gerhold.net> References: <20200114112110.51983-1-stephan@gerhold.net> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, patch@alsa-project.org, Srinivas Kandagatla , Stephan Gerhold Subject: [alsa-devel] [PATCH alsa-ucm-conf 5/7] codecs/msm8916-wcd: Earpiece: Add missing Enable/DisableSequence X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" Since commit 7d2f70f248ab ("ASoC: msm8916-wcd-analog: Add earpiece") in the Linux kernel, the Earpiece in msm8916-wcd is now supported. Add the necessary Enable/DisableSequence for it. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/codecs/msm8916-wcd/Earpiece.conf | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ucm2/codecs/msm8916-wcd/Earpiece.conf b/ucm2/codecs/msm8916-wcd/Earpiece.conf index e9f8b9d..726b436 100644 --- a/ucm2/codecs/msm8916-wcd/Earpiece.conf +++ b/ucm2/codecs/msm8916-wcd/Earpiece.conf @@ -5,4 +5,18 @@ SectionDevice."Earpiece" { "Speaker" "Headphones" ] + + EnableSequence [ + cset "name='RX1 MIX1 INP1' RX1" + cset "name='RDAC2 MUX' RX1" + cset "name='EAR_S' 1" + ## gain to 0dB + cset "name='RX1 Digital Volume' 128" + ] + + DisableSequence [ + cset "name='RX1 Digital Volume' 0" + cset "name='EAR_S' 0" + cset "name='RX1 MIX1 INP1' ZERO" + ] } From patchwork Tue Jan 14 11:21:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 193874 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B0A1C33CB3 for ; Tue, 14 Jan 2020 13:17:53 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE62B2467A for ; Tue, 14 Jan 2020 13:17:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="XIEG32IJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE62B2467A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gerhold.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (unknown [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8838F2F75; Tue, 14 Jan 2020 12:27:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8838F2F75 Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 26EE7F802C3; Tue, 14 Jan 2020 12:23:20 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 82258F8027C; Tue, 14 Jan 2020 12:23:12 +0100 (CET) Received: from mo6-p02-ob.smtp.rzone.de (mo6-p02-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5302::11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 83E84F8023E; Tue, 14 Jan 2020 12:22:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 83E84F8023E Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="XIEG32IJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1579000976; s=strato-dkim-0002; d=gerhold.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=cO79n30r7dHzozUPgz++lM22L44zcrhWHZMtMwLAfLY=; b=XIEG32IJ/muG2LlPwX14GeLZFJe48D143Bt39R43QodETmbJp2GXD9l8tcAkk+SzjF Ta5uIC8+lwp2CqwI1PRKN+i1kdQ8sSEPSB5YN6GB+A0eZ2G6ycxGSLtkeGDWzD7FM5sb 7L61p1AShonN+ueWY0Bk3N9vmabEWAHFV7bAgqB43CzgnPLW9PRjBQeIqJF02Lv3w8fy UcXF1RlgqvUumOy7Luzq+TPA+sM8LBg2hIJCiP4wvK8QEjUwp3pCpA0EFaaTaxJk+cKs axQR/sjC5CE3vbHYnIwCY7h92gRsGLU+Njra5U6P3i5Z/0ZVauplTcJuBQXnlvPAcCvy aI8w== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVORvLd4SsytBXQ7IOGU5qzCB3a93viaVr" X-RZG-CLASS-ID: mo00 Received: from localhost.localdomain by smtp.strato.de (RZmta 46.1.4 AUTH) with ESMTPSA id h048a6w0EBMuULI (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 14 Jan 2020 12:22:56 +0100 (CET) From: Stephan Gerhold To: Jaroslav Kysela Date: Tue, 14 Jan 2020 12:21:10 +0100 Message-Id: <20200114112110.51983-8-stephan@gerhold.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200114112110.51983-1-stephan@gerhold.net> References: <20200114112110.51983-1-stephan@gerhold.net> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, patch@alsa-project.org, Srinivas Kandagatla , Stephan Gerhold Subject: [alsa-devel] [PATCH alsa-ucm-conf 7/7] codecs/msm8916-wcd: Add ConflictingDevice for capture devices X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" At the moment, all capture devices are configured to go through DEC1, so there is no way to use more than one of the microphones at a time. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/codecs/msm8916-wcd/DigitalMic.conf | 6 ++++++ ucm2/codecs/msm8916-wcd/HeadsetMic.conf | 6 ++++++ ucm2/codecs/msm8916-wcd/PrimaryMic.conf | 6 ++++++ ucm2/codecs/msm8916-wcd/SecondaryMic.conf | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/ucm2/codecs/msm8916-wcd/DigitalMic.conf b/ucm2/codecs/msm8916-wcd/DigitalMic.conf index 35dfb1b..3446506 100644 --- a/ucm2/codecs/msm8916-wcd/DigitalMic.conf +++ b/ucm2/codecs/msm8916-wcd/DigitalMic.conf @@ -1,6 +1,12 @@ SectionDevice."DigitalMic" { Comment "Digital Microphone" + ConflictingDevice [ + "PrimaryMic" + "SecondaryMic" + "HeadsetMic" + ] + EnableSequence [ cset "name='DEC1 MUX' DMIC1" cset "name='CIC1 MUX' DMIC" diff --git a/ucm2/codecs/msm8916-wcd/HeadsetMic.conf b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf index 538d895..2a96e49 100644 --- a/ucm2/codecs/msm8916-wcd/HeadsetMic.conf +++ b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf @@ -1,6 +1,12 @@ SectionDevice."HeadsetMic" { Comment "Headset Microphone" + ConflictingDevice [ + "PrimaryMic" + "SecondaryMic" + "DigitalMic" + ] + EnableSequence [ cset "name='DEC1 MUX' ADC2" cset "name='CIC1 MUX' AMIC" diff --git a/ucm2/codecs/msm8916-wcd/PrimaryMic.conf b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf index 6998458..9d549ef 100644 --- a/ucm2/codecs/msm8916-wcd/PrimaryMic.conf +++ b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf @@ -1,6 +1,12 @@ SectionDevice."PrimaryMic" { Comment "Primary Microphone" + ConflictingDevice [ + "SecondaryMic" + "HeadsetMic" + "DigitalMic" + ] + EnableSequence [ cset "name='DEC1 MUX' ADC1" cset "name='CIC1 MUX' AMIC" diff --git a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf index fdc5df8..d81324c 100644 --- a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf +++ b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf @@ -1,6 +1,12 @@ SectionDevice."SecondaryMic" { Comment "Secondary Microphone" + ConflictingDevice [ + "PrimaryMic" + "HeadsetMic" + "DigitalMic" + ] + EnableSequence [ cset "name='DEC1 MUX' ADC2" cset "name='CIC1 MUX' AMIC"