From patchwork Tue Dec 5 11:57:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 174016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3374850vqy; Tue, 5 Dec 2023 03:57:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IG+ERYut1T/n+TRXWfb7sZB9ctK9gVRPuqyrDivzGYTIA8zEWXLkIpZI5rKgEzsMHD7AlaQ X-Received: by 2002:a17:902:8c95:b0:1d0:6ffe:1e9b with SMTP id t21-20020a1709028c9500b001d06ffe1e9bmr3041469plo.126.1701777468537; Tue, 05 Dec 2023 03:57:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701777468; cv=none; d=google.com; s=arc-20160816; b=UfMPOElvAhJQy0u4Pc2P++PAiolZ1lOBV4HZPrtW49hNU6bQkpWeLhVeb1hS9X7sML HmCcIDJzeVPrAANyaCja/ndpiHxYldgA+JVvGRxXF949NfO/O5ZJhbwEEZuych4G+m6C GsSJ3i1DufTYCdpBE1+gL9zHn689ziMubL3OAdsKLvXX7Ga9oeBgUUWXy2ZWprEuj824 mki3WxAKFXT/3u9jHnvJJKh4o2I4AKVZxxjthyHBFPNPpG3b4DYGT8auOXZoy3hLMksU NdKz0GhHCyovqaHikQ75Irs7/X5++JvDG+XUM4RXd6v6afd8lI+RieCsybNTF1XyJEBm 3fKg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zDLALbyZh6I9uDhyNX6OYJI2uOcXDuFhbmIPNGNpiVI=; fh=kIFLXAalib4m3oyAJtFB32oXQjB/JrbNA4+A/8ZQnpo=; b=VRq7jjlPOeIqGCtQjC0lSvs+fjjSMCKiuXrAbll8OpDWxeGqEXegjuurwCzuroGHs1 OgEAHeH3JIPtQypF0K2USnzyfHkxca/WBqqJsXFa/bwbIp9DFfZL4CmBZo9GcHOxS0FO 647L8wuAiJnsINUOWLyN+LNWIOUL4bj7rXuumr6dL7N+3aEyTEpoEbNkVSXog2gZQpd0 3nApeYDIyMb32Z0n7Fy/7PzZ+d7UwNWfhVox1SDeRBQlfWfsbZNP/4gFcW2tZ9pwAm12 lW4udpc0vcYVHDEZ/Sfjemnr6YFdSAwgaaJBtkgqhpBWdD+/1vlIbjo6cg66l3TmPtIh LQ0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=ncowCnTr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id x10-20020a170902ec8a00b001cfd934bda1si796948plg.232.2023.12.05.03.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 03:57:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=ncowCnTr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 8DA5280E6C64; Tue, 5 Dec 2023 03:57:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345178AbjLEL5h (ORCPT + 99 others); Tue, 5 Dec 2023 06:57:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345120AbjLEL5g (ORCPT ); Tue, 5 Dec 2023 06:57:36 -0500 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9935298; Tue, 5 Dec 2023 03:57:42 -0800 (PST) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3B56Q8Dw003885; Tue, 5 Dec 2023 05:57:32 -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=z DLALbyZh6I9uDhyNX6OYJI2uOcXDuFhbmIPNGNpiVI=; b=ncowCnTrliqfTm/9b lYMjhAOJCxU9R2sAkT61P+SWCM48oFKkDKnfFrMmUeuK1UKGsU30yqAv03+XpfCQ rnv+JPzbCEer5y9/J2upe77KBTywcm5+4McXM0k3Kx9BVolpCeqeqWMpwIfX5xUi +xrEdu520dLnPf60EIOvzrvelMNzLvwhFxUkKfb09ZvbaaLVLqYn6nE3OCyuNhbY 3ocUuc7Lbb1P6ZE7rTao6x3HciCytye1ipbMry9XU0Bxli2nU5k2pkMg927fiD0P EMR83jVVpXJKKg5GjhIgDzhT6EE7vMcs/+rgM8ZPCEZiE5RbNhTW4fqxCB3kc98R w9b6Q== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3ur1vnk6cu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 Dec 2023 05:57:32 -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 11:57:16 +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 11:57:15 +0000 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.82]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id CD6CC474; Tue, 5 Dec 2023 11:57:15 +0000 (UTC) From: Richard Fitzgerald To: , CC: , , , , , , , , , Richard Fitzgerald Subject: [PATCH] ASoC: Intel: soc-acpi-intel-mtl-match: Change CS35L56 prefixes to AMPn Date: Tue, 5 Dec 2023 11:57:15 +0000 Message-ID: <20231205115715.2460386-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Proofpoint-GUID: u_Z-suDzWBBvV_Jjv4TSiVPNc79YICfc X-Proofpoint-ORIG-GUID: u_Z-suDzWBBvV_Jjv4TSiVPNc79YICfc X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Tue, 05 Dec 2023 03:57:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784443011125207253 X-GMAIL-MSGID: 1784443011125207253 Change the ALSA prefix for the CS35L56 to "AMPn". This keeps them consistent with the CS35L56 HDA driver. It also avoids coding the chip ID into the control name, so that other Cirrus amps with the same controls can have the same control names. Signed-off-by: Richard Fitzgerald Fixes: 05fe62842804 ("ASoC: Intel: soc-acpi-intel-mtl-match: add acpi match table for cdb35l56-eight-c") --- sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c index f2c17cee1a5d..feb12c6c85d1 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -352,13 +352,13 @@ static const struct snd_soc_acpi_adr_device cs35l56_1_adr[] = { .adr = 0x00013701FA355601ull, .num_endpoints = 1, .endpoints = &spk_r_endpoint, - .name_prefix = "cs35l56-8" + .name_prefix = "AMP8" }, { .adr = 0x00013601FA355601ull, .num_endpoints = 1, .endpoints = &spk_3_endpoint, - .name_prefix = "cs35l56-7" + .name_prefix = "AMP7" } }; @@ -367,13 +367,13 @@ static const struct snd_soc_acpi_adr_device cs35l56_2_adr[] = { .adr = 0x00023301FA355601ull, .num_endpoints = 1, .endpoints = &spk_l_endpoint, - .name_prefix = "cs35l56-1" + .name_prefix = "AMP1" }, { .adr = 0x00023201FA355601ull, .num_endpoints = 1, .endpoints = &spk_2_endpoint, - .name_prefix = "cs35l56-2" + .name_prefix = "AMP2" } };