From patchwork Mon Jul 8 10:14:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 13726382 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 A4B8FC3271E for ; Mon, 8 Jul 2024 10:16:12 +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 ECAE5A4B; Mon, 8 Jul 2024 12:15:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz ECAE5A4B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1720433770; bh=jWIDSkUua3eh1V6yCKzn6GZFcC8GAHsNvbbyNGZx83A=; h=From:To:CC:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=ahjr6FR77T6D8aQJW2XypKS8OIX9KZpJP/tvHBv4UuJUDP8hG0XtlbM8Il9Qw+4Xp 2Na3R3u0a1cxr4FVkGm2JPev4sk/7YJ0/nS4sZJMs6k86C1OgjkqjS8ybFdphzhDmQ sl+yCoG2VCf9TRg0F5E69CmWT4JMi8DyOeRxShuE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 678B6F805BD; Mon, 8 Jul 2024 12:15:38 +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 D6706F805AC; Mon, 8 Jul 2024 12:15:37 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AEFE8F8020D; Mon, 8 Jul 2024 12:15:06 +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 C313EF8013D for ; Mon, 8 Jul 2024 12:14:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C313EF8013D 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=kVOAc5DN 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 4686mpVX007978; Mon, 8 Jul 2024 05:14:55 -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=hGyLTt/CriP9CW2S F1pOcfJT+wFKnpd4kYrdtuRGbiw=; b=kVOAc5DNwZsT2rSibYI4miHyfC1vQEQD u2x3PyEUc5Guoeg/vOhEBuP7VAeQWnKNb9pok2Z/ENrhOqQr7qjVN3gNoljB5eSy v1UKFlWP7JknfuOAM6qtPq4KqE/XVtyNCZD20O1FyCkMPjNf5kLoRXZGQyto6UQ9 ZqhMlSxQa4MV6pn+NjgDRErRj2fJTlOQH8Th0IX6AcdRO5B9hRn5FSA2kLa4uyJA aKAwtDW62d9lkh0pirs1/kpu9+dXcYwDBW4Qwb+Ke2wx8g4CXh8A9e+MXaMa6r+x X+TiH5sZNjAOQE00fs0Qjv4M1sO1azNnLNRljKSKo+tuby+z+fE0WQ== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4073axsc22-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Jul 2024 05:14:55 -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, 8 Jul 2024 11:14:52 +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, 8 Jul 2024 11:14:52 +0100 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id BD3B4820244; Mon, 8 Jul 2024 10:14:52 +0000 (UTC) From: Charles Keepax To: CC: , , , Subject: [PATCH alsa-cum-conf v3 1/2] sof-soundwire: Add missing match for cs42l43 speakers Date: Mon, 8 Jul 2024 11:14:51 +0100 Message-ID: <20240708101452.2498426-1-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: BLuFAr3oxr-A-pTYpf8NH-Jw2d5oSnTd X-Proofpoint-GUID: BLuFAr3oxr-A-pTYpf8NH-Jw2d5oSnTd X-Proofpoint-Spam-Reason: safe Message-ID-Hash: AW4GZ3XTCLJ22SIBOF4L6VKUAAIOANYE X-Message-ID-Hash: AW4GZ3XTCLJ22SIBOF4L6VKUAAIOANYE X-MailFrom: prvs=4919e0c630=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 --- No changes since v1. Thanks, Charles 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 Jul 8 10:14:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 13726384 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 453C5C3271E for ; Mon, 8 Jul 2024 10:17:29 +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 9C554857; Mon, 8 Jul 2024 12:17:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9C554857 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1720433847; bh=SVPmn6Cp6WHKowOLuTnClT5nOjNyb4fTwvPqEWbKwpc=; 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=YbNNvN3BeK4yHLG+GHERFyxQO3gox9iO9SQ9d6ZX3Yn6fzm3uqvxwrNji1AKhr9Yp zG9ahxqgjqGi/Wwuiu6cwSsR9epwsrZJmY/3i8+8cmWvk1XrIxV+nZf/Wl6k7q1pGn ECDxEmfVpoyJfF/Vyx3uoNxNVanU1SWMPE5rIVQ0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1961CF805AE; Mon, 8 Jul 2024 12:16:56 +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 A93F9F80587; Mon, 8 Jul 2024 12:16:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AAE90F801F5; Mon, 8 Jul 2024 12:16:51 +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 491C1F800FA for ; Mon, 8 Jul 2024 12:15:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 491C1F800FA 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=WuFrjfMz 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 4686mpVY007978; Mon, 8 Jul 2024 05:14:56 -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=xd1s+uwkp2jPD7pNtseguVyE2jtEQKH2yEfBRQITNoU=; b= WuFrjfMzyppIHWtaBxGwK02Dwbajhs9/OKDjcHF+25KKhJ5gkdW87zhmaOPDpVFS vPExz7DyaQ4DyDDVxiGmP61nVbodr8iJkOpXzzY7jxhTroNoMRIL+99Ok4iLmr6M WOn7iYp8tMe0NE7lJ4uxumxUBVtg0D2cKTocRU0ZW11t095l5pCFbMJWMTnuebtH EQ1v1En8IPkZg3Z3rI177XQG2iTAv7nctbqc/u2p+cK09ngNYOzbQBdVmJcwl77w IPRirCwSLfQO+r5LKR+YS4DDSZerPfz3nUR/+YdX7bOg0I94EZQ7l/PTvJJ3FtF9 tExuJbLBia8BSbMJF2YCow== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 4073axsc22-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 08 Jul 2024 05:14:55 -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; Mon, 8 Jul 2024 11:14:52 +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; Mon, 8 Jul 2024 11:14:52 +0100 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id CABB482024D; Mon, 8 Jul 2024 10:14:52 +0000 (UTC) From: Charles Keepax To: CC: , , , Subject: [PATCH v3 2/2] sof-soundwire: Add support for cs42l43/cs35l56 bridge configuration Date: Mon, 8 Jul 2024 11:14:52 +0100 Message-ID: <20240708101452.2498426-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240708101452.2498426-1-ckeepax@opensource.cirrus.com> References: <20240708101452.2498426-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ANlRT7F9Q9E04VUvoT9XN7RLXcnrPtfG X-Proofpoint-GUID: ANlRT7F9Q9E04VUvoT9XN7RLXcnrPtfG X-Proofpoint-Spam-Reason: safe Message-ID-Hash: NPI6HA6BVO6EGXABOWKEI6DAMM4JIVYR X-Message-ID-Hash: NPI6HA6BVO6EGXABOWKEI6DAMM4JIVYR X-MailFrom: prvs=4919e0c630=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 --- Changes since v1: - Updated control name to Speaker Digital. Thanks, Charles 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..5435b11 --- /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='Speaker Digital Switch'" { + "name='AMPL Speaker Switch'".vindex.0 0 + "name='AMPR Speaker Switch'".vindex.1 0 + } + "name='Speaker Digital 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 "Speaker Digital" + } +} 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 {