From patchwork Fri Feb 17 16:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 58687 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp974218wrn; Fri, 17 Feb 2023 08:16:24 -0800 (PST) X-Google-Smtp-Source: AK7set85wlpZKNmMhhweCnSgiy3oS7bHulQeaxjmc4gIAfwtUc7lr0LDIPnL8NpmDQXIgG85mD9P X-Received: by 2002:aa7:d0c9:0:b0:4ad:71bd:67c9 with SMTP id u9-20020aa7d0c9000000b004ad71bd67c9mr4241604edo.25.1676650584683; Fri, 17 Feb 2023 08:16:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676650584; cv=none; d=google.com; s=arc-20160816; b=qkiXld9IWgjJ9jFimTuZM2Snk6C/8G4zHvmlpk/tfuVhw5YZVEfVzyq4QJEdI1H1ZX O6nLEpSwUzpyFjYy7gLxSmKLOmRVheK3f79LPeGavnoimQok42d86F8CgoYh24lAPrMp TQoMc1ekEYFkMJUoPsQAPm/Y5vZQqlbuGyQ7LHl49YDOXaaEZM4reLJIoQ1jWoXbsVjZ FpdXC6Rtb7gi1/4m0jDJ+spUhcZZpLYrJRDLtDHzAfL5w4eIyGWOVVF05ddMHVjA4Of3 /fTgjK76Ces0SeVs5mURA7OQskAyq8bfwklw+YM2PblHID+EUFnU7icVVVKfhHAT4Uvt mZPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BTzjXHS8eGJxhVWLT03TdB551hVigNKYmkSmV3VC72k=; b=wsj6mAymEmudxvRcxeQMvDRrtOOAT3lEsdY48/OxR8a11efabcLCquGQAI3URuXqmp j382WnZnFFGqL7e37rCBg7s6314109Gcnn4C9OdyTbc+onJDsRPdt+Ze8rnlL0LN9yut Lcof8Z0HGjd4WdRqHnLUL1Ki0Je3xntccBJMiATCWv1cxJ2ahII0wbYrdU/9An4QF8xK veyWkhVrooAIlQkZ+t9gJzuJoDN9qGdsAlBdG0xAe3mlsPtCOfzGUXyw3j1/arT3rvbt +aHriYrtz/itap5roSp8cppG4BXVuK3AZbCTwgm1zwQEKRhnO3B73JHuyPlyLB6/SLCx WFfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=pN5baqNA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l17-20020a056402125100b004acc562f1dcsi5528268edw.601.2023.02.17.08.16.01; Fri, 17 Feb 2023 08:16:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=pN5baqNA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230465AbjBQQO6 (ORCPT + 99 others); Fri, 17 Feb 2023 11:14:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230471AbjBQQOc (ORCPT ); Fri, 17 Feb 2023 11:14:32 -0500 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03DE170962 for ; Fri, 17 Feb 2023 08:14:29 -0800 (PST) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31HFgnU6014021; Fri, 17 Feb 2023 10:14:14 -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=BTzjXHS8eGJxhVWLT03TdB551hVigNKYmkSmV3VC72k=; b=pN5baqNAzos9zTAUCDG08LxOESwchhnD/w4UVCnBRuwhy+pB7cqipWYf+D22yQBmGrWI TleYihdhcks1/3y5JhLNuJ9oVbSiUZT6mau+9q8w9Vx8zOUsGKzScLY8wwhAk4cHdUDg ++wM8+5S6kgkEInvBuXunPMnVS8B9Ky7lMwNXwIrQieu/QZls0G2+cj/fjqkmOneBkzE neWOKDFM3wdPS7cN0VkjRJbZPmDNLaiZZE9zr8OdHBtArxT8YWjmpnlE97xmFieMrD2Z 5sVVXEVQP94uCqAN5ByCKFA0UKHQG3QzVlt4xswxT5EkKQ4HN7Bb9P3hcALmLcp+bGXQ 8w== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3nrm8wm7t6-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 10:14:13 -0600 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.1118.21; Fri, 17 Feb 2023 10:14:10 -0600 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.21 via Frontend Transport; Fri, 17 Feb 2023 10:14:10 -0600 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.127]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id DE46745; Fri, 17 Feb 2023 16:14:10 +0000 (UTC) From: Richard Fitzgerald To: , , , , , CC: , , , Richard Fitzgerald Subject: [PATCH 10/10] ASoC: Intel: soc-acpi: Add CS35L56 Soundwire to TGL Date: Fri, 17 Feb 2023 16:14:10 +0000 Message-ID: <20230217161410.915202-11-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230217161410.915202-1-rf@opensource.cirrus.com> References: <20230217161410.915202-1-rf@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-GUID: mqzk6flip_3wcJ6k9Ft6Lz4HKUzCdVT6 X-Proofpoint-ORIG-GUID: mqzk6flip_3wcJ6k9Ft6Lz4HKUzCdVT6 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758095563506352839?= X-GMAIL-MSGID: =?utf-8?q?1758095563506352839?= This adds match entries for one or four CS35L56 on SDW0. Signed-off-by: Richard Fitzgerald --- .../intel/common/soc-acpi-intel-tgl-match.c | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c index ef19150e7b2e..dae76c96d9fe 100644 --- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c @@ -414,6 +414,51 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = { }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_tgl_machines); +static const struct snd_soc_acpi_adr_device cs35l56_sdw0_adr[] = { + { + .adr = 0x00003001fa355601, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "AMP1" + }, + { + .adr = 0x00003101fa355601, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "AMP2" + }, + { + .adr = 0x00003201fa355601, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "AMP3" + }, + { + .adr = 0x00003301fa355601, + .num_endpoints = 1, + .endpoints = &single_endpoint, + .name_prefix = "AMP4" + }, +}; + +static const struct snd_soc_acpi_link_adr up_extreme_cs35l56_sdw0_one[] = { + { + .mask = BIT(0), + .num_adr = 1, + .adr_d = cs35l56_sdw0_adr, + }, + {} +}; + +static const struct snd_soc_acpi_link_adr up_extreme_cs35l56_sdw0_four[] = { + { + .mask = BIT(0), + .num_adr = 4, + .adr_d = cs35l56_sdw0_adr, + }, + {} +}; + /* this table is used when there is no I2S codec present */ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { /* mockup tests need to be first */ @@ -501,6 +546,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-tgl-rt711.tplg", }, + { + .link_mask = BIT(0), + .links = up_extreme_cs35l56_sdw0_four, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-tgl-cs35l56-sdw0.tplg" + }, + { + .link_mask = BIT(0), + .links = up_extreme_cs35l56_sdw0_one, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-tgl-cs35l56-sdw0.tplg" + }, {}, }; EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_tgl_sdw_machines);