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: 11332223 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 18EC31398 for ; Tue, 14 Jan 2020 13:18:22 +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 9A4E124683 for ; Tue, 14 Jan 2020 13:18:21 +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 9A4E124683 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 889812E92; Tue, 14 Jan 2020 12:23:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 889812E92 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) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 313ECF8026F; Tue, 14 Jan 2020 12:23:02 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 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:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 11332429 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7DBFD1398 for ; Tue, 14 Jan 2020 14:40:24 +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 2659024680 for ; Tue, 14 Jan 2020 14:40:22 +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="KVd+3A58" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2659024680 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 0DC872EBC; Tue, 14 Jan 2020 12:24:00 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0DC872EBC Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5241FF80272; Tue, 14 Jan 2020 12:23:08 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id B454EF8026A; Tue, 14 Jan 2020 12:23:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mo6-p01-ob.smtp.rzone.de (mo6-p01-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5301::8]) (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 EEBD9F8014D; Tue, 14 Jan 2020 12:22:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EEBD9F8014D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="KVd+3A58" 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=9b4rut5pXi4QNHAkPipy/MGbf+b448qzHQmOW9B8bJY=; b=KVd+3A58lYxtJ3kO9Vm6+t0PTRVvrxTg0cSidcY1bCEGZMRQCUc3/tP94TPlXEfG1c CQx5fw+8Sy7wT2tXF0pdg3c/7DFgMvaODyje5FB2DxAVGWDZnZkxBw+XPUC743V8JnZC FfuVR6mucP+5K1amv9wjYXfO40f28J+j/5KR46a5O2B0a47sDULRHn2I0SSMyc9fujUJ WAvCYBrgzWCLTyJ1LNsi4pRudTtaZunAiED2jvVqygsHtCIDuJcEyfgrnqMWT4QecE26 reGA6pTn01tlNC8A97NdzSTalIL9TdNyYBfYM9bMwPY5P0n80EXovcqwDcKUos4lPYX5 CnIw== 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 h048a6w0EBMsULC (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:05 +0100 Message-Id: <20200114112110.51983-3-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 2/7] DB410c: Split devices into re-usable fragments in codecs/msm8916-wcd 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 DB410c use case configuration is also useful for other MSM8916 devices. However, the available devices usually depend on the exact device model. For example, DB410c has nothing connected to the Earpiece, most MSM8916 smartphones do not have a DigitalMic, and some use a custom speaker amplifier (connected via I2S) instead of the speaker amplifier provided by PM8916. Similar differences across devices are handled using re-usable device fragments in the codecs/ directory. Do the same for msm8916-wcd and move the device fragments to codecs/msm8916-wcd. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/DB410c/HiFi.conf | 128 +--------------------- ucm2/codecs/msm8916-wcd/DigitalMic.conf | 12 ++ ucm2/codecs/msm8916-wcd/Earpiece.conf | 8 ++ ucm2/codecs/msm8916-wcd/Headphones.conf | 30 +++++ ucm2/codecs/msm8916-wcd/HeadsetMic.conf | 16 +++ ucm2/codecs/msm8916-wcd/PrimaryMic.conf | 14 +++ ucm2/codecs/msm8916-wcd/SecondaryMic.conf | 16 +++ ucm2/codecs/msm8916-wcd/Speaker.conf | 20 ++++ 8 files changed, 122 insertions(+), 122 deletions(-) create mode 100644 ucm2/codecs/msm8916-wcd/DigitalMic.conf create mode 100644 ucm2/codecs/msm8916-wcd/Earpiece.conf create mode 100644 ucm2/codecs/msm8916-wcd/Headphones.conf create mode 100644 ucm2/codecs/msm8916-wcd/HeadsetMic.conf create mode 100644 ucm2/codecs/msm8916-wcd/PrimaryMic.conf create mode 100644 ucm2/codecs/msm8916-wcd/SecondaryMic.conf create mode 100644 ucm2/codecs/msm8916-wcd/Speaker.conf diff --git a/ucm2/DB410c/HiFi.conf b/ucm2/DB410c/HiFi.conf index a0ef42c..4b82fbf 100644 --- a/ucm2/DB410c/HiFi.conf +++ b/ucm2/DB410c/HiFi.conf @@ -13,126 +13,10 @@ SectionVerb { } } + + -SectionDevice."Speaker" { - Comment "Speaker playback" - - ConflictingDevice [ - "Headphones" - "Earpiece" - ] - - EnableSequence [ - cset "name='SPK DAC Switch' 1" - cset "name='RX3 MIX1 INP1' RX1" - ## gain to 0dB - cset "name='RX3 Digital Volume' 128" - ] - - DisableSequence [ - cset "name='SPK DAC Switch' 0" - cset "name='RX3 MIX1 INP1' ZERO" - ] -} - - -SectionDevice."Headphones" { - Comment "Headphones playback" - - ConflictingDevice [ - "Speaker" - "Earpiece" - ] - EnableSequence [ - cset "name='RX1 MIX1 INP1' RX1" - cset "name='RX2 MIX1 INP1' RX2" - cset "name='RDAC2 MUX' RX2" - cset "name='HPHL' 1" - cset "name='HPHR' 1" - ## gain to 0dB - cset "name='RX1 Digital Volume' 128" - ## gain to 0dB - cset "name='RX2 Digital Volume' 128" - ] - - DisableSequence [ - cset "name='RX1 Digital Volume' 0" - cset "name='RX2 Digital Volume' 0" - cset "name='HPHL' 0" - cset "name='HPHR' 0" - cset "name='RDAC2 MUX' ZERO" - cset "name='RX1 MIX1 INP1' ZERO" - cset "name='RX2 MIX1 INP1' ZERO" - ] -} - -SectionDevice."Earpiece" { - Comment "Earpiece playback" - - ConflictingDevice [ - "Speaker" - "Headphones" - ] -} - -SectionDevice."HeadsetMic" { - Comment "Headset Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC2" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC2 Volume' 8" - cset "name='ADC2 MUX' INP2" - ] - - DisableSequence [ - cset "name='ADC2 MUX' ZERO" - cset "name='ADC2 Volume' 0" - cset "name='DEC1 MUX' ZERO" - ] -} - -SectionDevice."PrimaryMic" { - Comment "Primary Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC1" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC1 Volume' 8" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - cset "name='ADC1 Volume' 0" - ] -} - -SectionDevice."SecondaryMic" { - Comment "Secondary Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' ADC2" - cset "name='CIC1 MUX' AMIC" - cset "name='ADC2 Volume' 8" - cset "name='ADC2 MUX' INP2" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - cset "name='ADC2 Volume' 0" - cset "name='ADC2 MUX' ZERO" - ] -} - -SectionDevice."DigitalMic" { - Comment "Digital Microphone" - - EnableSequence [ - cset "name='DEC1 MUX' DMIC1" - cset "name='CIC1 MUX' DMIC" - ] - - DisableSequence [ - cset "name='DEC1 MUX' ZERO" - ] -} + + + + diff --git a/ucm2/codecs/msm8916-wcd/DigitalMic.conf b/ucm2/codecs/msm8916-wcd/DigitalMic.conf new file mode 100644 index 0000000..35dfb1b --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/DigitalMic.conf @@ -0,0 +1,12 @@ +SectionDevice."DigitalMic" { + Comment "Digital Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' DMIC1" + cset "name='CIC1 MUX' DMIC" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/Earpiece.conf b/ucm2/codecs/msm8916-wcd/Earpiece.conf new file mode 100644 index 0000000..e9f8b9d --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/Earpiece.conf @@ -0,0 +1,8 @@ +SectionDevice."Earpiece" { + Comment "Earpiece playback" + + ConflictingDevice [ + "Speaker" + "Headphones" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/Headphones.conf b/ucm2/codecs/msm8916-wcd/Headphones.conf new file mode 100644 index 0000000..7a2090e --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/Headphones.conf @@ -0,0 +1,30 @@ +SectionDevice."Headphones" { + Comment "Headphones playback" + + ConflictingDevice [ + "Speaker" + "Earpiece" + ] + + EnableSequence [ + cset "name='RX1 MIX1 INP1' RX1" + cset "name='RX2 MIX1 INP1' RX2" + cset "name='RDAC2 MUX' RX2" + cset "name='HPHL' 1" + cset "name='HPHR' 1" + ## gain to 0dB + cset "name='RX1 Digital Volume' 128" + ## gain to 0dB + cset "name='RX2 Digital Volume' 128" + ] + + DisableSequence [ + cset "name='RX1 Digital Volume' 0" + cset "name='RX2 Digital Volume' 0" + cset "name='HPHL' 0" + cset "name='HPHR' 0" + cset "name='RDAC2 MUX' ZERO" + cset "name='RX1 MIX1 INP1' ZERO" + cset "name='RX2 MIX1 INP1' ZERO" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/HeadsetMic.conf b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf new file mode 100644 index 0000000..538d895 --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/HeadsetMic.conf @@ -0,0 +1,16 @@ +SectionDevice."HeadsetMic" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC2 Volume' 8" + cset "name='ADC2 MUX' INP2" + ] + + DisableSequence [ + cset "name='ADC2 MUX' ZERO" + cset "name='ADC2 Volume' 0" + cset "name='DEC1 MUX' ZERO" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/PrimaryMic.conf b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf new file mode 100644 index 0000000..6998458 --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/PrimaryMic.conf @@ -0,0 +1,14 @@ +SectionDevice."PrimaryMic" { + Comment "Primary Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC1" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC1 Volume' 8" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + cset "name='ADC1 Volume' 0" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf new file mode 100644 index 0000000..7811509 --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf @@ -0,0 +1,16 @@ +SectionDevice."SecondaryMic" { + Comment "Secondary Microphone" + + EnableSequence [ + cset "name='DEC1 MUX' ADC2" + cset "name='CIC1 MUX' AMIC" + cset "name='ADC2 Volume' 8" + cset "name='ADC2 MUX' INP2" + ] + + DisableSequence [ + cset "name='DEC1 MUX' ZERO" + cset "name='ADC2 Volume' 0" + cset "name='ADC2 MUX' ZERO" + ] +} diff --git a/ucm2/codecs/msm8916-wcd/Speaker.conf b/ucm2/codecs/msm8916-wcd/Speaker.conf new file mode 100644 index 0000000..2b1dd8a --- /dev/null +++ b/ucm2/codecs/msm8916-wcd/Speaker.conf @@ -0,0 +1,20 @@ +SectionDevice."Speaker" { + Comment "Speaker playback" + + ConflictingDevice [ + "Headphones" + "Earpiece" + ] + + EnableSequence [ + cset "name='SPK DAC Switch' 1" + cset "name='RX3 MIX1 INP1' RX1" + ## gain to 0dB + cset "name='RX3 Digital Volume' 128" + ] + + DisableSequence [ + cset "name='SPK DAC Switch' 0" + cset "name='RX3 MIX1 INP1' ZERO" + ] +} 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: 11332293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 396041398 for ; Tue, 14 Jan 2020 13:24:45 +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 A466624679 for ; Tue, 14 Jan 2020 13:24:44 +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 A466624679 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 226382F21; Tue, 14 Jan 2020 12:26:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 226382F21 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) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1025BF80276; Tue, 14 Jan 2020 12:23:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 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:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 11332207 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4EF606C1 for ; Tue, 14 Jan 2020 13:17:02 +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 D09E524670 for ; Tue, 14 Jan 2020 13:17:01 +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="E5Izllmj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D09E524670 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 97CBB2ED8; Tue, 14 Jan 2020 12:24:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 97CBB2ED8 Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 112F5F80276; Tue, 14 Jan 2020 12:23:12 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id B65E9F80277; Tue, 14 Jan 2020 12:23:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mo6-p01-ob.smtp.rzone.de (mo6-p01-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5301::4]) (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 04B21F800E9; Tue, 14 Jan 2020 12:22:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 04B21F800E9 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="E5Izllmj" 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=5yTE7cLlgXleUHOY2MlqK1MoBnw7WgPHiBcoPkvG1SQ=; b=E5IzllmjtQwZl12arc8rrozgtdw0WxwiWOdhdO6Lx3cSfx4eWxzQQJa3yKd7M4tMbw KkOSDk6QiiCYxtz9APJ6QXyfPAhYGhnM8Gv3SN3Vil0BFTtCN0uwjPWQnLi7c1d2IvAz cNsGIc/mA70xTaKPQaVKDMux5vQmIKwT76fVO7/5sHghKHaAgxy+S+H66vf3rTkXqpm4 rNChH1x1LmuEtleQUb6omBAlr8h8A3D44Xp6noLYi3m2N9PY1sXrqLs+hu6AfF+4XN0j n3qIKnXelXcgP8Nm+Zll2HKJKssOaw7dzfzw4gbJpOIoxfTdPtDDrjUCqRViISIjzBl8 2kOQ== 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 h048a6w0EBMtULE (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:07 +0100 Message-Id: <20200114112110.51983-5-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 4/7] codecs/msm8916-wcd: Headphones: Drop invalid RDAC2 MUX value 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" As of commit 9110d1b0e229c ("ASoC: msm8916-wcd-analog: Fix RX1 selection in RDAC2 MUX") in the Linux kernel, the RDAC2 MUX mixer can be only set to RX1 or RX2. Drop the invalid value from the UCM configuration. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/codecs/msm8916-wcd/Headphones.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/ucm2/codecs/msm8916-wcd/Headphones.conf b/ucm2/codecs/msm8916-wcd/Headphones.conf index 7a2090e..380787d 100644 --- a/ucm2/codecs/msm8916-wcd/Headphones.conf +++ b/ucm2/codecs/msm8916-wcd/Headphones.conf @@ -23,7 +23,6 @@ SectionDevice."Headphones" { cset "name='RX2 Digital Volume' 0" cset "name='HPHL' 0" cset "name='HPHR' 0" - cset "name='RDAC2 MUX' ZERO" cset "name='RX1 MIX1 INP1' ZERO" cset "name='RX2 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: 11332301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78DE46C1 for ; Tue, 14 Jan 2020 13:25:18 +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 0F30924670 for ; Tue, 14 Jan 2020 13:25:18 +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 0F30924670 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 241DD2670; Tue, 14 Jan 2020 12:25:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 241DD2670 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) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id A9B82F80277; Tue, 14 Jan 2020 12:23:09 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 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:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 11332241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F9C46C1 for ; Tue, 14 Jan 2020 13:19:50 +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 0790124676 for ; Tue, 14 Jan 2020 13:19:50 +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="pB4K8EQp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0790124676 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 5C02F2F99; Tue, 14 Jan 2020 12:28:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5C02F2F99 Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 17DD8F802DC; Tue, 14 Jan 2020 12:23:21 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3C64BF8023E; Tue, 14 Jan 2020 12:23:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mo6-p02-ob.smtp.rzone.de (mo6-p02-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5302::4]) (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 58CEDF8022B; Tue, 14 Jan 2020 12:22:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 58CEDF8022B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gerhold.net header.i=@gerhold.net header.b="pB4K8EQp" 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=U++9evuYwcWoU5YFoQziAJqHtLy5yjtkXx0498uVvPc=; b=pB4K8EQpR6mDJ2zmWQoPyD3GpVjQFhrk3R15xdQkp5kiXdWqMUrgFjKX4Al0kIq3pz 1DNW8ShA+9ddkLztWlmwLZvsxd6PgulWRn2LwYEb9rImbnGlsg0KmaQ/oGnifxrexC9j Yhb/sxhhL4w3Rd20XDeuQluwCHDGVkIcbyKxxAy6+r/HmY0mL3Qx1UrlHETt7nmx5SyS hKPn8JKtSSgBuepGpkD6FLe/agS20GByn2lZQdMniTpTFZUuxlh6KTV3Fs0Xcw5dirm6 jEkB7zXb93xlUtFTJbUHttCsvScAMhKeOgJsJ4L4z5UNZ3CVWKsw+8PvFhZ4AooIep5y rXTA== 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 h048a6w0EBMtULG (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:09 +0100 Message-Id: <20200114112110.51983-7-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 6/7] codecs/msm8916-wcd: SecondaryMic: Select correct input 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, enabling "SecondaryMic" actually results in enabling the HeadsetMic. The enable sequence for the secondary microphone is similar, but ADC2 MUX must be set to INP3 and the volume set through ADC3 Volume. Cc: Srinivas Kandagatla Signed-off-by: Stephan Gerhold --- ucm2/codecs/msm8916-wcd/SecondaryMic.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf index 7811509..fdc5df8 100644 --- a/ucm2/codecs/msm8916-wcd/SecondaryMic.conf +++ b/ucm2/codecs/msm8916-wcd/SecondaryMic.conf @@ -4,13 +4,13 @@ SectionDevice."SecondaryMic" { EnableSequence [ cset "name='DEC1 MUX' ADC2" cset "name='CIC1 MUX' AMIC" - cset "name='ADC2 Volume' 8" - cset "name='ADC2 MUX' INP2" + cset "name='ADC3 Volume' 8" + cset "name='ADC2 MUX' INP3" ] DisableSequence [ cset "name='DEC1 MUX' ZERO" - cset "name='ADC2 Volume' 0" + cset "name='ADC3 Volume' 0" cset "name='ADC2 MUX' 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: 11332233 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C17001398 for ; Tue, 14 Jan 2020 13:19:08 +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 58B5C24676 for ; Tue, 14 Jan 2020 13:19:08 +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 58B5C24676 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 E5DA72F78; Tue, 14 Jan 2020 12:27:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E5DA72F78 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) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 82258F8027C; Tue, 14 Jan 2020 12:23:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_PASS,SPF_NONE,SURBL_BLOCKED,URIBL_BLOCKED autolearn=disabled version=3.4.0 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"