From patchwork Tue Dec 5 14:24:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 750409 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 D8BA7C4167B for ; Tue, 5 Dec 2023 14:25: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 131D0DF9; Tue, 5 Dec 2023 15:25:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 131D0DF9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1701786328; bh=+9U7lTLXFmXO4cGfsSfbvjsmVcPVaWiLU8wGYpgmDRA=; h=From:To:CC:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=MQO0Bdcec6FEnWAuv6X7x4UvgpefLG9VNplKeSP/TSvESWD01ik/2d/U38VmlPrQ5 zgO8uQ4mNJz5ldiLiNOt5vF9FG7QkdpNuoz9ukkT9/FxhXLe9g1UdNLwHEwjqh+MQi OtcdMP2AuSZpbbCcRmlJSZ4Q2zRZoo81hLFAMsJg= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9DF39F805C3; Tue, 5 Dec 2023 15:24:38 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id BFEB7F805C5; Tue, 5 Dec 2023 15:24:37 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id EB88EF8024E; Tue, 5 Dec 2023 15:24:32 +0100 (CET) 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 1116AF80166 for ; Tue, 5 Dec 2023 15:24:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1116AF80166 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=lpL61ZFG Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B56mS62002076; Tue, 5 Dec 2023 08:24:24 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=k NGwJRuCDSQPDWHxSRcWN5IiutDcB9RgwlpBxLTtnaY=; b=lpL61ZFGOAD3nEDKt /35g2zpo0Bv7dp1qU/ZTvJZGNETRvmhEyFmTEVIRUbazKgG9H+UUrx/+tc0Rr2Yz ceX2qzrhY0N2Q0YjHu+oqrsahEYfcpjZ6TWXFvW+47NeCKunAx5n0o+yvfV4tVcu hxx+vSRhtMHlNIApJ8whtGQj9t6eXNB168wuIjfZDxV5m2J0JtcdG/dNjGp2ZjJK XTbwi4XcdEZBxT+dcQvKCwbh2789I29btaqGnG79w6O/HdsCXPCUOZGyZIQI5JUR PWNQl4hJTYkvKYsWmO+sCmeNA1Mzmj3U+lwzPtiEhbTJmctVOAvnYtxPs+45N1FU 90DXg== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3ur2v23992-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 Dec 2023 08:24:23 -0600 (CST) 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.1118.40; Tue, 5 Dec 2023 14:24:20 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Tue, 5 Dec 2023 14:24:20 +0000 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id C3110474; Tue, 5 Dec 2023 14:24:20 +0000 (UTC) From: Charles Keepax To: CC: , , , , Subject: [PATCH alsa-ucm-conf 1/2] sof-soundwire: Add basic support for cs42l43 Date: Tue, 5 Dec 2023 14:24:19 +0000 Message-ID: <20231205142420.1256042-1-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: z8E0KvEVDv-vghmrasVXgr0j5m7rQYYV X-Proofpoint-GUID: z8E0KvEVDv-vghmrasVXgr0j5m7rQYYV X-Proofpoint-Spam-Reason: safe Message-ID-Hash: P4H5SPE5RJAOWYTOUZ7WH7MHI3Y6UEM6 X-Message-ID-Hash: P4H5SPE5RJAOWYTOUZ7WH7MHI3Y6UEM6 X-MailFrom: prvs=7703bda8c8=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: cs42l43 is a codec device, add basic support for it. Including a dual channel DMIC input, stereo headphones, and a mono headset microphone. Signed-off-by: Charles Keepax --- ucm2/sof-soundwire/cs42l43-dmic.conf | 28 +++++++++++++++++ ucm2/sof-soundwire/cs42l43.conf | 47 ++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 ucm2/sof-soundwire/cs42l43-dmic.conf create mode 100644 ucm2/sof-soundwire/cs42l43.conf diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf new file mode 100644 index 0000000..bf59eca --- /dev/null +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -0,0 +1,28 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Mic" { + Comment "Microphones" + + ConflictingDevice [ + "Headset" + ] + + EnableSequence [ + cset "name='cs42l43 DP1TX1 Input' 'Decimator 3'" + cset "name='cs42l43 DP1TX2 Input' 'Decimator 4'" + cset "name='cs42l43 Decimator 3 Switch' on" + cset "name='cs42l43 Decimator 4 Switch' on" + ] + + DisableSequence [ + cset "name='cs42l43 Decimator 3 Switch' off" + cset "name='cs42l43 Decimator 4 Switch' off" + cset "name='cs42l43 DP1TX1 Input' 'None'" + cset "name='cs42l43 DP1TX2 Input' 'None'" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + } +} diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf new file mode 100644 index 0000000..378dbb2 --- /dev/null +++ b/ucm2/sof-soundwire/cs42l43.conf @@ -0,0 +1,47 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='cs42l43 Headphone L Input 1' 'DP5RX1'" + cset "name='cs42l43 Headphone R Input 1' 'DP5RX2'" + ] + + DisableSequence [ + cset "name='cs42l43 Headphone L Input 1' 'None'" + cset "name='cs42l43 Headphone R Input 1' 'None'" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId},0" + PlaybackVolume "cs42l43 Headphone Digital Volume" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='cs42l43 ADC1 Input' 'IN1'" + cset "name='cs42l43 Decimator 1 Mode' 'ADC'" + + cset "name='cs42l43 DP1TX1 Input' 'Decimator 1'" + cset "name='cs42l43 DP1TX2 Input' 'Decimator 1'" + ] + + DisableSequence [ + cset "name='cs42l43 DP1TX1 Input' 'None'" + cset "name='cs42l43 DP1TX2 Input' 'None'" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},4" + CaptureVolume "cs42l43 Decimator 1 Volume" + CaptureSwitch "cs42l43 Decimator 1 Switch" + JackControl "Headset Mic Jack" + } +} From patchwork Tue Dec 5 14:24:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 751118 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 7C4F4C4167B for ; Tue, 5 Dec 2023 14:25:10 +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 5EE07E0D; Tue, 5 Dec 2023 15:24:57 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5EE07E0D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1701786307; bh=733NKxL4h+wm93HSHEujcT1ATDcM1CePguDygm1Gurg=; 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=FQ7NatVN2ec74CkH+GSLE6uAtcrPf+r7ZQANj0kW47lG2LLQvah17iT3Eabcikqcv Ll4JptoLnLRvWFCb7hcjG46r+fsLSXUhyGj6SoNIUghpnVNYa8DXZp++9/l3mAsnB9 1yhPP1fXF2wmS20R4vgzdeOq/wfYv7vxRyC/pn4M= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AAFA7F8057E; Tue, 5 Dec 2023 15:24:35 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id AF51FF80580; Tue, 5 Dec 2023 15:24:34 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7974FF8025A; Tue, 5 Dec 2023 15:24:30 +0100 (CET) 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 93823F800F5 for ; Tue, 5 Dec 2023 15:24:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 93823F800F5 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=q0JfNGpC Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B5AskcD031438; Tue, 5 Dec 2023 08:24:23 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=wsjEGUR0569MHdb3SMMQYhhzcIU8dA3MM8+YXYMq2bE=; b= q0JfNGpCXBjjWZv1Hhi9C5jG/3ghdShdwijm3zNqUb+qLE+xfl0O8uprgzbhb4mu R9xaTUJ6noAW3SfTISx433hTwW1U7OTYdXJCYd7XdrBcOh0KWdkouAkhV5onEHYM 1aB3MebdO1B85wxYhZ9enDi747VXwX845+csy6PJt9WiYpmKCT0MBswhWqmd6Tit aDobsUt5HlQtROkoSS3ZF1v+aIbB+J5llYmzF+9Lg7039Do6eUgddThU8R2OiV0h vIEC8tTj6yy7hwvmUKQGIs0VysPTc7ZY4L69DtA4DqnlYbvoBV2XdPieQg2LR7Fx dxURtgqb5Xt4BfJJhzleGg== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3ur2v23991-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 Dec 2023 08:24:23 -0600 (CST) 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.1118.40; Tue, 5 Dec 2023 14:24:20 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Tue, 5 Dec 2023 14:24:20 +0000 Received: from algalon.ad.cirrus.com (algalon.ad.cirrus.com [198.90.251.122]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id D125811D1; Tue, 5 Dec 2023 14:24:20 +0000 (UTC) From: Charles Keepax To: CC: , , , , Subject: [PATCH alsa-ucm-conf 2/2] sof-soundwire: Add basic support for a 4x cs35l56 configuration Date: Tue, 5 Dec 2023 14:24:20 +0000 Message-ID: <20231205142420.1256042-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231205142420.1256042-1-ckeepax@opensource.cirrus.com> References: <20231205142420.1256042-1-ckeepax@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: kvhZ5AtE0R2l5o5FDhagjV_HFRUmlFvO X-Proofpoint-GUID: kvhZ5AtE0R2l5o5FDhagjV_HFRUmlFvO X-Proofpoint-Spam-Reason: safe Message-ID-Hash: T2VDX4JHFXLHA7ZPLAUYNX27U5YWE4WU X-Message-ID-Hash: T2VDX4JHFXLHA7ZPLAUYNX27U5YWE4WU X-MailFrom: prvs=7703bda8c8=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: cs35l56 is a boosted speaker amp add UCM support for a 4 amp configuration. Signed-off-by: Charles Keepax --- ucm2/sof-soundwire/cs35l56-4.conf | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 ucm2/sof-soundwire/cs35l56-4.conf diff --git a/ucm2/sof-soundwire/cs35l56-4.conf b/ucm2/sof-soundwire/cs35l56-4.conf new file mode 100644 index 0000000..f5af1e4 --- /dev/null +++ b/ucm2/sof-soundwire/cs35l56-4.conf @@ -0,0 +1,24 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + EnableSequence [ + cset "name='AMP1 Speaker Switch' 1" + cset "name='AMP2 Speaker Switch' 1" + cset "name='AMP3 Speaker Switch' 1" + cset "name='AMP4 Speaker Switch' 1" + ] + + DisableSequence [ + cset "name='AMP4 Speaker Switch' 0" + cset "name='AMP3 Speaker Switch' 0" + cset "name='AMP2 Speaker Switch' 0" + cset "name='AMP1 Speaker Switch' 0" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + } +}