From patchwork Wed Oct 2 14:29:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Strozek X-Patchwork-Id: 832223 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 0A014CF6D28 for ; Wed, 2 Oct 2024 14:30:56 +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 27E10E0D; Wed, 2 Oct 2024 16:30:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 27E10E0D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727879454; bh=ErPkfOwBTC5KFcU3ZDKD62x5EEYp8c6KsEVuEZ7DI3o=; h=From:To:CC:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=BWYEzUopTL6WqgOda7QMSwSIiIBEcL1t6uHh8c+nyqoNOoemLC3Gqwl9gnt4Sf9xb QrUiPhThpIBIjAS1CJdxjOJl0cUU8ZGrImT/xJzNeHVRGahx1IxVFBeR0/imExJ+Zr V8gp76JWPaP3MNUweoqPYJZtXtcD0hPL134Bm84o= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1558AF805E1; Wed, 2 Oct 2024 16:30:13 +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 7911CF805E1; Wed, 2 Oct 2024 16:30:13 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 69AA6F80517; Wed, 2 Oct 2024 16:30:05 +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 5F720F80508 for ; Wed, 2 Oct 2024 16:30:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5F720F80508 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=VDOi2JBO 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 4926KwR5000732; Wed, 2 Oct 2024 09:29:58 -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=5Qts3orW7hcEq/FF gc0E/n6Jm1L/fZkrF4alazwK4e8=; b=VDOi2JBOR7CuP3tn8qIE8uLOwu3iODVl xRTc8Duezy4FePoig4DzIbyl38Qscq/i32y3mVmyRRBBZGSbLOal80iqbnvni174 xO+NzjIpspeax6xbVTEnpGTiTAJLysWxeodJGIZ9E8UHWLVuUakeFO22xlTyHUfc 9BzJONG9eIhgx2tso1oppp6Tr4nqfJQDA94RZGeUqV6H+2Jt6Zr/1x4LiLovsfqX pnuRKLu9cnfJK0tlTOgydPf9xGvOSzBTc4cuycxnwKBNbo92Ubct2SbUNeKtTyRx mcfJNktyZr8faN2KLHg8xw8L1IkDsCt0zWwSXm0+enHs3GzYkT6PuQ== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 41xe7jw7vg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Oct 2024 09:29:58 -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; Wed, 2 Oct 2024 15:29:56 +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; Wed, 2 Oct 2024 15:29:56 +0100 Received: from ediswws03.ad.cirrus.com (ediswws03.ad.cirrus.com [198.90.208.11]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id C822A820248; Wed, 2 Oct 2024 14:29:56 +0000 (UTC) From: Maciej Strozek To: CC: , , "Maciej Strozek" Subject: [PATCH alsa-ucm-conf v2 1/2] sof-soundwire: Change mapped control names to make them unique Date: Wed, 2 Oct 2024 15:29:46 +0100 Message-ID: <20241002142947.4015912-1-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 8Emkv2nebqyQqvfj5i4ZyPHU8f_m4huk X-Proofpoint-GUID: 8Emkv2nebqyQqvfj5i4ZyPHU8f_m4huk X-Proofpoint-Spam-Reason: safe Message-ID-Hash: A6JYE5JFLADVPIWCCPDM7C4AT427MC5R X-Message-ID-Hash: A6JYE5JFLADVPIWCCPDM7C4AT427MC5R X-MailFrom: prvs=7005510c00=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 as substrings 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. Fixes: e87dde51d689 ("sof-soundwire: Add basic support for cs42l43") Fixes: e4277a204cd6 ("sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration") Signed-off-by: Maciej Strozek --- v2: Rename to "Speaker Playback" instead of "Speaker Combined" --- ucm2/codecs/cs42l43/init.conf | 4 ++-- ucm2/sof-soundwire/cs35l56-bridge.conf | 6 +++--- ucm2/sof-soundwire/cs42l43-dmic.conf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.39.5 diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index 10a6e1f..cf61833 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -2,11 +2,11 @@ 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 } 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" } } From patchwork Wed Oct 2 14:29:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Strozek X-Patchwork-Id: 832445 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 15268CF6D28 for ; Wed, 2 Oct 2024 14:30:45 +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 4CAF4850; Wed, 2 Oct 2024 16:30:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4CAF4850 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1727879443; bh=LbaIkjMn2T/qFzP3EUrmSJRwxkrrGPGpe0Yjfir23FE=; 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=DpcJYOu2Szm9Pp3om8Rxk21wcA66CwcRWPTPyuwjT02MYh+2s/6N6WmI0RNqYaWKh AK1fuAhbEhcjo77AmZ4bZpxGU7JzUL3Q9jKTb6x9S5pb0jHL1p8SbKVV9Wt23hjUeG Sc7dzGNQ+2AVD/SHHk/7QmUpiMyjoERT1wthZ5Fs= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B22B7F8001E; Wed, 2 Oct 2024 16:30:11 +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 68493F80580; Wed, 2 Oct 2024 16:30:11 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 989CBF80518; Wed, 2 Oct 2024 16:30:03 +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 36FA7F8001E for ; Wed, 2 Oct 2024 16:30:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 36FA7F8001E 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=cltZFlcn 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 4926KwR6000732; Wed, 2 Oct 2024 09:29:59 -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=dTCekQOOPx6KCM72yeUoEYHBa6xB9D98cP6rPfH3EEA=; b= cltZFlcntOeKIVr54Z2rquYS/CZ4J3EwHsNKRt7LKNGgs8us6ZyAsZSuV6u+p0wx drA7sUIK80Sc7FBknnMklTggAh0XT9tdBhTHHX1tR8rEPBBtLUbd2F3hj5oK18iA /T4mz0p1/Zj+wNOoycZSVdvQlz/BYwM4ASgIitbn2aiz+qeXg/K5kVyP0C6J2UlR hte2N/pimz6v/bNniICGXbYqV3qZpuHBNCGw1NTXQ2tQ3AkSKoqkI4AelqA4tqe2 oQBf4V5zBRAFhwPc3FJKEW030Vu7WLJyWDTRX0q7kq5fJnLSbId2iZ8c6F2gLstc YZoo1pton93FaBqRnfgUww== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 41xe7jw7vg-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 02 Oct 2024 09:29:59 -0500 (CDT) Received: from ediex01.ad.cirrus.com (198.61.84.80) 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; Wed, 2 Oct 2024 15:29:58 +0100 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1544.9 via Frontend Transport; Wed, 2 Oct 2024 15:29:58 +0100 Received: from ediswws03.ad.cirrus.com (ediswws03.ad.cirrus.com [198.90.208.11]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 0FB1C820248; Wed, 2 Oct 2024 14:29:58 +0000 (UTC) From: Maciej Strozek To: CC: , , "Maciej Strozek" Subject: [PATCH alsa-ucm-conf v2 2/2] sof-soundwire: Add sequence for controlling Mic Mute LED Date: Wed, 2 Oct 2024 15:29:47 +0100 Message-ID: <20241002142947.4015912-2-mstrozek@opensource.cirrus.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241002142947.4015912-1-mstrozek@opensource.cirrus.com> References: <20241002142947.4015912-1-mstrozek@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: gUuJ_6WkMBMcrB_5NJ03XmzyNbPQLxi0 X-Proofpoint-GUID: gUuJ_6WkMBMcrB_5NJ03XmzyNbPQLxi0 X-Proofpoint-Spam-Reason: safe Message-ID-Hash: Q2PSUDOFKFW6ZN2XHODOHWBBSTDK4YQP X-Message-ID-Hash: Q2PSUDOFKFW6ZN2XHODOHWBBSTDK4YQP X-MailFrom: prvs=7005510c00=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: Signed-off-by: Maciej Strozek --- v2: no changes --- ucm2/codecs/cs42l43/init.conf | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.39.5 diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index cf61833..fad41dd 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -12,3 +12,9 @@ LibraryConfig.remap.Config { } } } + +FixedBootSequence [ + exec "-/sbin/modprobe snd_ctl_led" + 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" +]