From patchwork Thu Oct 17 09:49:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Strozek X-Patchwork-Id: 13839758 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 25FF4D2126D for ; Thu, 17 Oct 2024 09:50:57 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 455276C1; Thu, 17 Oct 2024 11:50:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 455276C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1729158655; bh=zpGpd8k/QmdFdWxYZETNPIj88H6+/nAoDWS/HIN+8do=; h=From:To:CC:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=A2ZKQ/gHX8Kz5TS/th0w61D9rtr2m/XHYH2+cqXmo2jJ7oWpMwyAr51aut2/g6baF cibvPK8b+tFdTvFgo8Kdwsoc5Xkk/WvL226lkCYAZnGqZHWRkOGuTtB4jZeJKJZ2sx A9wVR5nltVlQIVagQytIeYxZZljqPMmnUBAb+X6Y= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1C934F805E0; Thu, 17 Oct 2024 11:50:19 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id CB484F805E1; Thu, 17 Oct 2024 11:50:18 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 197B2F805C3; Thu, 17 Oct 2024 11:50:13 +0200 (CEST) Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) (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 E52E9F80579 for ; Thu, 17 Oct 2024 11:50:10 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E52E9F80579 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=cirrus.com header.i=@cirrus.com header.a=rsa-sha256 header.s=PODMain02222019 header.b=CEtvGjZK Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49H5Vms2004939; Thu, 17 Oct 2024 04:50:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=PODMain02222019; bh=FEdVeUtMDmI8nzgq BVY+akjz2//1USId6rGJrrCwSWU=; b=CEtvGjZKRp9xy6QSMTDkB9mNEckieJKG OYCGNG/1lT6cH35ZLjU5TDYH5y7eOnTvn6unSwjTFebx+8JRsDINFpxKhLjGj1Uq FSBScIxjbkVd+1hBy30eayd/GH8Rl8CnqtsHpwZ/nPGOovVNbPTVAMjtG2+WXwdI omS8i8hKlyjDJ8xz8nRLODPTKLhM6UDple9STZllHHOVmVVM4tYat9NvCSdDU5+/ 5W90n0j2TRCgtgVJUUbFb2gBUhqrJ1pC6MVMwLwErNWpI677Si5TX77/hGiO8+G5 W4B5JAZX+x2YU5tQoynWnuv2gyIJVpEOUCz1nNPa/mssjIFHoab1uw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 427nhk5tys-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 04:50:08 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 17 Oct 2024 10:49:45 +0100 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1544.9 via Frontend Transport; Thu, 17 Oct 2024 10:49:45 +0100 Received: from ediswws03.ad.cirrus.com (ediswws03.ad.cirrus.com [198.90.208.11]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 72C59820248; Thu, 17 Oct 2024 09:49:45 +0000 (UTC) From: Maciej Strozek To: CC: , , "Maciej Strozek" Subject: [PATCH alsa-ucm-conf v4 1/2] sof-soundwire: Change map control names to make them unique and user friendly Date: Thu, 17 Oct 2024 10:49:43 +0100 Message-ID: <20241017094944.950632-1-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Proofpoint-GUID: wzWwHdxC0F_k2l72DoEOx6EPRsWOOJ1A X-Proofpoint-ORIG-GUID: wzWwHdxC0F_k2l72DoEOx6EPRsWOOJ1A X-Proofpoint-Spam-Reason: safe Message-ID-Hash: QEMUHL2OMIRFZV73SELSICR4BLFQSAPI X-Message-ID-Hash: QEMUHL2OMIRFZV73SELSICR4BLFQSAPI X-MailFrom: prvs=7020e5b0b2=mstrozek@opensource.cirrus.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Both 'Speaker Digital' and 'cs42l43 PDM2' names were found in other alsa controls, confusing the MixerElems paths. Make them unique to avoid errors for hardware mutes. Also add 'Capture' string into microphone controls to make them work properly. Signed-off-by: Maciej Strozek --- v4: Add "CaptureMixer" to headset config v3: Make Headset Microphone more user-friendly and contain the word "Capture" v2: Rename to "Speaker Playback" instead of "Speaker Combined" --- ucm2/codecs/cs42l43/init.conf | 10 ++++++++-- ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++--- ucm2/sof-soundwire/cs42l43-dmic.conf | 2 +- ucm2/sof-soundwire/cs42l43.conf | 3 ++- 4 files changed, 14 insertions(+), 7 deletions(-) -- 2.39.5 diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index 10a6e1f..b2796e2 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -2,13 +2,19 @@ LibraryConfig.remap.Config { ctl.default.map { - "name='cs42l43 PDM2 Switch'" { + "name='cs42l43 Microphone Capture Switch'" { "name='cs42l43 Decimator 3 Switch'".vindex.0 0 "name='cs42l43 Decimator 4 Switch'".vindex.1 0 } - "name='cs42l43 PDM2 Volume'" { + "name='cs42l43 Microphone Capture Volume'" { "name='cs42l43 Decimator 3 Volume'".vindex.0 0 "name='cs42l43 Decimator 4 Volume'".vindex.1 0 } + "name='cs42l43 Headset Microphone Capture Switch'" { + "name='cs42l43 Decimator 1 Switch'".vindex.0 0 + } + "name='cs42l43 Headset Microphone Capture Volume'" { + "name='cs42l43 Decimator 1 Volume'".vindex.0 0 + } } } diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf index 5435b11..a3cf6ad 100644 --- a/ucm2/sof-soundwire/cs35l56-bridge.conf +++ b/ucm2/sof-soundwire/cs35l56-bridge.conf @@ -2,11 +2,11 @@ LibraryConfig.remap.Config { ctl.default.map { - "name='Speaker Digital Switch'" { + "name='Speaker Playback Switch'" { "name='AMPL Speaker Switch'".vindex.0 0 "name='AMPR Speaker Switch'".vindex.1 0 } - "name='Speaker Digital Volume'" { + "name='Speaker Playback Volume'" { "name='AMPL Speaker Volume'".vindex.0 0 "name='AMPR Speaker Volume'".vindex.1 0 } @@ -56,6 +56,6 @@ SectionDevice."Speaker" { PlaybackPriority 100 PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" - PlaybackMixerElem "Speaker Digital" + PlaybackMixerElem "Speaker Playback" } } diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf index d5f895d..b68a70d 100644 --- a/ucm2/sof-soundwire/cs42l43-dmic.conf +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -21,6 +21,6 @@ SectionDevice."Mic" { CapturePriority 100 CapturePCM "hw:${CardId},4" CaptureMixer "default:${CardId}" - CaptureMixerElem "cs42l43 PDM2" + CaptureMixerElem "cs42l43 Microphone" } } diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf index 1702cf0..ddca67a 100644 --- a/ucm2/sof-soundwire/cs42l43.conf +++ b/ucm2/sof-soundwire/cs42l43.conf @@ -40,7 +40,8 @@ SectionDevice."Headset" { Value { CapturePriority 200 CapturePCM "hw:${CardId},4" - CaptureMixerElem "cs42l43 Decimator 1" + CaptureMixer "default:${CardId}" + CaptureMixerElem "cs42l43 Headset Microphone" JackControl "Headset Mic Jack" } } From patchwork Thu Oct 17 09:49:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Strozek X-Patchwork-Id: 13839757 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 11CC4D21269 for ; Thu, 17 Oct 2024 09:50:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8086B84D; Thu, 17 Oct 2024 11:50:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8086B84D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1729158634; bh=UFu0SDfC91tkSQ9NhYa7rDxhtSdj4Go4hPP/KcNxNIo=; h=From:To:CC:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XvLV9mI27EVAV/sg0iOyCtbgdAP7LHrHB+tkC0xTyGWbOYbZTeW7EwHchrXJ7HszI VuqIsO9c58igVzh4C5wb8CdVyaaCDrOWFP6dVdZEehfIgbPVmOAU2N1Ck5iTfzptAS iW493DL9+iXXBMpmaZqFvzzoHOBcYSyPp4Ie9TuA= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C63ABF805B0; Thu, 17 Oct 2024 11:50:04 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 8DA98F805B0; Thu, 17 Oct 2024 11:50:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5F843F80448; Thu, 17 Oct 2024 11:49:53 +0200 (CEST) Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 1C95BF80149 for ; Thu, 17 Oct 2024 11:49:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1C95BF80149 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=cirrus.com header.i=@cirrus.com header.a=rsa-sha256 header.s=PODMain02222019 header.b=SU3G8hbE Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49GNNjmt009535; Thu, 17 Oct 2024 04:49:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= PODMain02222019; bh=hW1H9nMqrhhhNxordSUu/xf4Vx348qh5xHjWwdc2gOY=; b= SU3G8hbE0FBX52cMNKYuiyQeXmLY1iayky8dpEGNljjmRcTpl9wOUd5OPQIowNKu TrwQuOv3E3jNWF0e3QlRqMh8tZp5S/D0Pp449ze8rdwGZ5h+sUfArWxYvEo8F7Ui hY6WmM0VW+QadiHVfNY1gGjfO+Mwe83iTnG5WPramHcmcncomB0nEDhDTRSMgwTI O6nmp0mWl345UNEwHgkp2PFcIVu+E+Ot488PYAIwpygkXt5ymny15ukD7+IQHIn/ lcqXmtqf5SaBc5Oh6wZ0I1DlN4vL51wiVy6DDkmAl7W3ZWp296go+EsMHiOaCXcM lOvP0k/+2kKbJP3T2acYZA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 427pgxp856-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 17 Oct 2024 04:49:47 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 17 Oct 2024 10:49:45 +0100 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1544.9 via Frontend Transport; Thu, 17 Oct 2024 10:49:45 +0100 Received: from ediswws03.ad.cirrus.com (ediswws03.ad.cirrus.com [198.90.208.11]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 765FC82024B; Thu, 17 Oct 2024 09:49:45 +0000 (UTC) From: Maciej Strozek To: CC: , , "Maciej Strozek" Subject: [PATCH alsa-ucm-conf v4 2/2] sof-soundwire: Add sequence for controlling Mic Mute LED Date: Thu, 17 Oct 2024 10:49:44 +0100 Message-ID: <20241017094944.950632-2-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241017094944.950632-1-mstrozek@opensource.cirrus.com> References: <20241017094944.950632-1-mstrozek@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: hEyuL2HO7FpgZF4JRDhq9VwjK0lKF0Jl X-Proofpoint-ORIG-GUID: hEyuL2HO7FpgZF4JRDhq9VwjK0lKF0Jl X-Proofpoint-Spam-Reason: safe Message-ID-Hash: 2ZMJXAQCIH47T3IIVY5IFZ6L522RN3QC X-Message-ID-Hash: 2ZMJXAQCIH47T3IIVY5IFZ6L522RN3QC X-MailFrom: prvs=7020e5b0b2=mstrozek@opensource.cirrus.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Also ensure the unused microphone is disabled so that currently used mic can fully control the LED. Signed-off-by: Maciej Strozek --- v4: no changes v3: Add Headset Microphone, ensure unused mic is disabled v2: no changes --- ucm2/codecs/cs42l43/init.conf | 7 +++++++ ucm2/sof-soundwire/cs42l43-dmic.conf | 2 ++ ucm2/sof-soundwire/cs42l43.conf | 1 + 3 files changed, 10 insertions(+) -- 2.39.5 diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index b2796e2..c2f52ad 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -18,3 +18,10 @@ LibraryConfig.remap.Config { } } } + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 1 Switch" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 3 Switch" + sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 4 Switch" +] diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf index b68a70d..70ce40f 100644 --- a/ucm2/sof-soundwire/cs42l43-dmic.conf +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -13,6 +13,8 @@ SectionDevice."Mic" { ] DisableSequence [ + cset "name='cs42l43 Decimator 3 Switch' 0" + cset "name='cs42l43 Decimator 4 Switch' 0" cset "name='cs42l43 DP1TX1 Input' 'None'" cset "name='cs42l43 DP1TX2 Input' 'None'" ] diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf index ddca67a..dc11840 100644 --- a/ucm2/sof-soundwire/cs42l43.conf +++ b/ucm2/sof-soundwire/cs42l43.conf @@ -33,6 +33,7 @@ SectionDevice."Headset" { ] DisableSequence [ + cset "name='cs42l43 Decimator 1 Switch' 0" cset "name='cs42l43 DP1TX1 Input' 'None'" cset "name='cs42l43 DP1TX2 Input' 'None'" ]