From patchwork Mon Jun 24 12:20:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 807062 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 57FB9C2BD09 for ; Mon, 24 Jun 2024 12:21:28 +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 A6AB21CF; Mon, 24 Jun 2024 14:21:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A6AB21CF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1719231686; bh=aYbNbBFHiYx2Zv1mXu+yI//b+XG//zhg+Qgg/MlAAgo=; h=From:To:CC:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=Z6PO8D1RmC2wdNpXgkMhdNhvw3XpAh8cQURai45PdGsdCwenfOubDjvHbU/3Bj1zb xoITJm5aCN8huK7qsV1PEk9B+uGSwqqs/LwBjPT+HzB0DgpcIvU4LZQMHlZxT6HDvQ E1uyaYwRGR/KHCgpSQcvxO2WR4nCIgV4tY00ZC5w= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 09385F80587; Mon, 24 Jun 2024 14:20:51 +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 6D945F805BA; Mon, 24 Jun 2024 14:20:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 56E28F80495; Mon, 24 Jun 2024 14:20:47 +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 EF03EF80154 for ; Mon, 24 Jun 2024 14:20:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EF03EF80154 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=WhSgKTZF 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 45O7je4L027262; Mon, 24 Jun 2024 07:20:43 -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=i2HcqK+ELboYchfz lK0TDw4MXiEXi/QPmMumecRlwnY=; b=WhSgKTZFNLgzYVzEVitPWimrHZE4DKYZ pdSUZ2PPjlDAvzDZGXOQwPGIwc3x3XrnCt6iZ03+PbLViRXpcSinzdtvIGPOOX+K T+bIS3g/dPA7Eq+VSUh2KBRAaIXr+UgFG2efOD3vLDzkSswlG/xdfB+1uz0jMWm+ IjlRdeixqqlIM6kWTt4ulUMHE6RzlpXRCyKuMIYzoM+uagQynOzEVUJ/fNPRp/X7 T/PyIyVGRS3gSd149Bx4RUb5C+wLRnhpVPkacFGH5sqAeUKbXtOJckGOwP2QlYPy lkJeVrhgWcbdhHkJwZ/DZbmQDlggNZDxN+GC5rn4ZwYApL9helVv1w== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3ywu1hsn0k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jun 2024 07:20:42 -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; Mon, 24 Jun 2024 13:20:41 +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; Mon, 24 Jun 2024 13:20:41 +0100 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 393C5820244; Mon, 24 Jun 2024 12:20:41 +0000 (UTC) From: Charles Keepax To: CC: , , , Subject: [PATCH alsa-ucm-conf 1/2] sof-soundwire: Add missing match for cs42l43 speakers Date: Mon, 24 Jun 2024 13:20:40 +0100 Message-ID: <20240624122041.952863-1-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: kNiZ1Kn4zvRywORJ6neZTRPhZzhUzxse X-Proofpoint-GUID: kNiZ1Kn4zvRywORJ6neZTRPhZzhUzxse X-Proofpoint-Spam-Reason: safe Message-ID-Hash: Q7MOINSEPQCBQVD3CMGZV6Z7FWRRXAID X-Message-ID-Hash: Q7MOINSEPQCBQVD3CMGZV6Z7FWRRXAID X-MailFrom: prvs=3905e7e383=ckeepax@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: The cs42l43 reports as cs42l43-spk in the speaker case, the regex in sof-soundwire needs updated to recognise that. Fixes: 035d9206cffd ("sof-soundwire: Add basic support for cs42l43's speaker") Signed-off-by: Charles Keepax --- ucm2/sof-soundwire/sof-soundwire.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 31492e3..2f61d11 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -21,7 +21,7 @@ Define { DefineRegex { SpeakerCodec { - Regex " spk:([a-z0-9]+(-sdca)?)" + Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)" String "${CardComponents}" } SpeakerChannels { From patchwork Mon Jun 24 12:20:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 807293 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 12D1AC2D0D1 for ; Mon, 24 Jun 2024 12:21:46 +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 3938C6C1; Mon, 24 Jun 2024 14:21:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3938C6C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1719231704; bh=quN3GCu727mkYwNqw2GpV6NVVObYioBkxAul5I2vmcY=; 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=GNkmtl44GwH+nkP+hi3mHpjieW5fmNVeyHvoVZxn9mdslpR7hqyThaX2tnMVEY/Cr HbRT27+eV2km9culJWblmIfDo2g79ao/BA1b++sIkRhzdELtTcsrPXtSp8rtXpDu0f 75boPbSX7kHRbqnCjgmUClcOkoFhwSVS3C1sT4vM= Received: by alsa1.perex.cz (Postfix, from userid 50401) id B97FBF805E2; Mon, 24 Jun 2024 14:20:54 +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 0583FF805E5; Mon, 24 Jun 2024 14:20:54 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 652F9F80495; Mon, 24 Jun 2024 14:20:50 +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 A9FCBF80154 for ; Mon, 24 Jun 2024 14:20:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A9FCBF80154 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=D2z/tc2v 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 45O7jFfs001265; Mon, 24 Jun 2024 07:20:43 -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=NAQiw9Lfn5b4wkQDfb7cAGW02PiLIbTJ52todkMah9A=; b= D2z/tc2vFiGOXsvGaZYZ5tWyS6bq08muoCPhICCT9JG710tV/yF47yVwyemmEzcA FRurHtRjmt8ODaL5cKAmTfeOfXWgGg0PJsTcekK/pn64W5/BST52kShgsezrn3ch OP00peoLDWJ8Kn2hixI0h2Wv6NdXi6cYyPbs03kyJpfdlp4BYRTAcazp0Rfi9URr jp0eWPeKI/WZy6UjzhKmb2TyHkCauBqK58534WyfH0KcCwJ0hV2RM56TecOJLruB EsnDeHOKfOpUjfWshRpflNU2iHBbDURRNDQ+qhwMQIyqUZZYM3kbvvpU0XBYgGtk V5hNkY4CXzg8jhOhZ/Gd2A== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3ywv0x9jjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 24 Jun 2024 07:20:43 -0500 (CDT) Received: from ediex01.ad.cirrus.com (198.61.84.80) 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; Mon, 24 Jun 2024 13:20:41 +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; Mon, 24 Jun 2024 13:20:41 +0100 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 4715882024D; Mon, 24 Jun 2024 12:20:41 +0000 (UTC) From: Charles Keepax To: CC: , , , Subject: [PATCH alsa-ucm-conf 2/2] sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration Date: Mon, 24 Jun 2024 13:20:41 +0100 Message-ID: <20240624122041.952863-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624122041.952863-1-ckeepax@opensource.cirrus.com> References: <20240624122041.952863-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: nCTECa08KtxC2B4Rj8RzUIYZY7dWR2c4 X-Proofpoint-GUID: nCTECa08KtxC2B4Rj8RzUIYZY7dWR2c4 X-Proofpoint-Spam-Reason: safe Message-ID-Hash: 742QUD5TZ24G7D4XFAU3BWL2L6DVNN25 X-Message-ID-Hash: 742QUD5TZ24G7D4XFAU3BWL2L6DVNN25 X-MailFrom: prvs=3905e7e383=ckeepax@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: The cs42l43 has both a SPI master and an I2S interface, in some configurations 2 cs35l56 amplifiers are connected to these to provide bass speakers whilst the cs42l43's internal speaker drivers are used for the tweeters. Add UCM configuration for this type of system. Signed-off-by: Charles Keepax --- ucm2/sof-soundwire/cs35l56-bridge.conf | 61 ++++++++++++++++++++++++++ ucm2/sof-soundwire/sof-soundwire.conf | 2 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 ucm2/sof-soundwire/cs35l56-bridge.conf diff --git a/ucm2/sof-soundwire/cs35l56-bridge.conf b/ucm2/sof-soundwire/cs35l56-bridge.conf new file mode 100644 index 0000000..6fafc80 --- /dev/null +++ b/ucm2/sof-soundwire/cs35l56-bridge.conf @@ -0,0 +1,61 @@ +# Use case Configuration for sof-soundwire card + +LibraryConfig.remap.Config { + ctl.default.map { + "name='cs42l43 Bridge Switch'" { + "name='AMPL Speaker Switch'".vindex.0 0 + "name='AMPR Speaker Switch'".vindex.1 0 + } + "name='cs42l43 Bridge Volume'" { + "name='AMPL Speaker Volume'".vindex.0 0 + "name='AMPR Speaker Volume'".vindex.1 0 + } + } +} + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='cs42l43 Speaker L Input 1' 'ASPRX1'" + cset "name='cs42l43 Speaker R Input 1' 'ASPRX2'" + cset "name='cs42l43 ASPTX1 Input' 'DP5RX1'" + cset "name='cs42l43 ASPTX2 Input' 'DP5RX2'" + + cset "name='AMPL ASP1 TX1 Source' 'DSP1TX1'" + cset "name='AMPL ASP1 TX2 Source' 'None'" + cset "name='AMPL ASP1 TX3 Source' 'None'" + cset "name='AMPL ASP1 TX4 Source' 'None'" + + cset "name='AMPR ASP1 TX1 Source' 'None'" + cset "name='AMPR ASP1 TX2 Source' 'DSP1TX1'" + cset "name='AMPR ASP1 TX3 Source' 'None'" + cset "name='AMPR ASP1 TX4 Source' 'None'" + + cset "name='cs42l43 Speaker Digital Switch' 1" + cset "name='cs42l43 Speaker Digital Volume' 128" + ] + + DisableSequence [ + cset "name='cs42l43 Speaker Digital Switch' 0" + + cset "name='AMPL ASP1 TX2 Source' 'None'" + cset "name='AMPR ASP1 TX1 Source' 'None'" + + cset "name='cs42l43 ASPTX1 Input' 'None'" + cset "name='cs42l43 ASPTX2 Input' 'None'" + cset "name='cs42l43 Speaker L Input 1' 'None'" + cset "name='cs42l43 Speaker R Input 1' 'None'" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},0" + PlaybackMixer "default:${CardId}" + PlaybackMixerElem "cs42l43 Bridge" + } +} diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 2f61d11..2ede1cd 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -21,7 +21,7 @@ Define { DefineRegex { SpeakerCodec { - Regex " spk:([a-z0-9]+((-sdca)|(-spk))?)" + Regex " spk:([a-z0-9]+((-sdca)|(-spk)|(-bridge))?)" String "${CardComponents}" } SpeakerChannels {