Received: by 2002:a05:6358:53a8:b0:117:f937:c515 with SMTP id z40csp5516931rwe; Tue, 18 Apr 2023 07:54:52 -0700 (PDT) X-Google-Smtp-Source: AKy350ZLE4sx+y+oZs2gGvIcqjmwphRUtYSghzoWvmDRQF9T/ktmmEsb4zeItb1r8lLA923TDMZ/ X-Received: by 2002:a17:90a:c28d:b0:246:c5d8:c070 with SMTP id f13-20020a17090ac28d00b00246c5d8c070mr952pjt.23.1681829692074; Tue, 18 Apr 2023 07:54:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681829692; cv=none; d=google.com; s=arc-20160816; b=Z0VHxR7sCcDXJq+09eQpTlUULjbyNdOU9CjDRBYFUDm+tb7ubwAbdTTOqyFBnd45Ut hNrHjiQJr9WksDCewKFieSZiT4nryZTIYxPd/2zw5+qycYHlPCTW5GPg/NPh5esHszlD 1JbTlBj2cGi2kNHIDFfHQwcmV++ANvviLkyRv2Senig94+2173hA6oKPE0KxTI2B2eaq R1zOPSkF4t4evMmjSbOtWAgwtgJpiNoTUAxVRb7Fz4t+qb15C/tqGjKcBX529+/TW2IQ 6I+Fi9QUpFCYf3Z+58DEBTMy+evzF8IowycIiuqnmwXWU6P7I13tDiapgHVEuZR6WtP/ 7tOQ== 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=t8WyjzhCrkfZ5fX9RDFeeNevFK4MJDp5bpQRc8WUyFY=; b=A/lEc4kKmulpilIe08OCzF+++5SGUwa4I0BqBQLE9wirj0tBaTQR/lKAlbnG/MM4Jh 9eLiGWrCO1OwmjP+TTqZCo3E6lJb9xZh0tZTg9yN41B1sxgLkA+qyXSsHcvqUJUxK5A1 oFuGzxfa4mjNeBk1Y5NSEBhh67XmIKbPdYjhxMmdgpGu/cDazacnDSctj/1EEI4/gltU FJ/olgC647EFNRfsgsjfTBmjo36VKs+G2EjZdapxrk04yTb1Q3zWdiN6o4iE6ZoyQZJ4 aLHmd5aMGzyzcN6Fr6WhN7PCXSlmbcvLQcaujZq9O8Vj7d17cYhzzTA0JZ9hSTIo/DUZ gabg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=mLbiS1h6; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s17-20020a17090aad9100b002496c7b0495si1014388pjq.128.2023.04.18.07.54.40; Tue, 18 Apr 2023 07:54:52 -0700 (PDT) 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=mLbiS1h6; 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 S232095AbjDROnc (ORCPT + 99 others); Tue, 18 Apr 2023 10:43:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231825AbjDROn0 (ORCPT ); Tue, 18 Apr 2023 10:43:26 -0400 Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F9DBA5E2 for ; Tue, 18 Apr 2023 07:43:24 -0700 (PDT) Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33IDaWqf031292; Tue, 18 Apr 2023 09:43:12 -0500 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=t8WyjzhCrkfZ5fX9RDFeeNevFK4MJDp5bpQRc8WUyFY=; b=mLbiS1h6zlGO9kenH7o2ObjLMqqCeo7f1hUpeFZLnrbkUpR1UAwUfbk0kuA9YYwE3qa+ 95tUuRUiaqtY1477jqLuRnVirvaIt2fQopgM3KVnngVx9gqxdM54/46iv84efIAFun6V q1G8fAMi2OH/vFW/ZI/SlMZMthesb8W2VSqq164p+Mackd2KOP+I9fQ/4kM9FENRIc2r dKbD1RWI0/IudEZSjtOvV1oFuC0HS7Q59KvUa1wBoETDhpH5fb5iPCTou6A+fM3ACMnr ijysVnV3BAKz09c1+QBoCIiAMQFrjJ63eIsLOuMNYK0InLm8qKy8EzKYzVXoUmjRIlmT QA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3pysb4wm9n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 09:43:12 -0500 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.26; Tue, 18 Apr 2023 09:43:10 -0500 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.26 via Frontend Transport; Tue, 18 Apr 2023 09:43:10 -0500 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 2A1E3B06; Tue, 18 Apr 2023 14:43:10 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Richard Fitzgerald Subject: [PATCH 4/4] ASoC: cs35l56: Rename mixer source defines for SoundWire DP1 Date: Tue, 18 Apr 2023 15:43:09 +0100 Message-ID: <20230418144309.1100721-5-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230418144309.1100721-1-rf@opensource.cirrus.com> References: <20230418144309.1100721-1-rf@opensource.cirrus.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-ORIG-GUID: o-3gFuMmFc1LxGRYlj1ZVPAUFpOhN8sh X-Proofpoint-GUID: o-3gFuMmFc1LxGRYlj1ZVPAUFpOhN8sh 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, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 Rename the mixer source defines from CS35L56_INPUT_SRC_SWIRE_RXn to CS35L56_INPUT_SRC_SWIRE_DP1_CHANNELn to match the latest datasheet. Signed-off-by: Richard Fitzgerald --- include/sound/cs35l56.h | 4 ++-- sound/soc/codecs/cs35l56-shared.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sound/cs35l56.h b/include/sound/cs35l56.h index 0b2f7cfc6a4a..002042b1c73c 100644 --- a/include/sound/cs35l56.h +++ b/include/sound/cs35l56.h @@ -179,8 +179,8 @@ #define CS35L56_INPUT_SRC_DSP1TX8 0x39 #define CS35L56_INPUT_SRC_TEMPMON 0x3A #define CS35L56_INPUT_SRC_INTERPOLATOR 0x40 -#define CS35L56_INPUT_SRC_SWIRE_RX1 0x44 -#define CS35L56_INPUT_SRC_SWIRE_RX2 0x45 +#define CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL1 0x44 +#define CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL2 0x45 #define CS35L56_INPUT_MASK 0x7F #define CS35L56_NUM_INPUT_SRC 21 diff --git a/sound/soc/codecs/cs35l56-shared.c b/sound/soc/codecs/cs35l56-shared.c index 93a1b056660b..60da8c75b7b9 100644 --- a/sound/soc/codecs/cs35l56-shared.c +++ b/sound/soc/codecs/cs35l56-shared.c @@ -302,8 +302,8 @@ const unsigned int cs35l56_tx_input_values[] = { CS35L56_INPUT_SRC_DSP1TX8, CS35L56_INPUT_SRC_TEMPMON, CS35L56_INPUT_SRC_INTERPOLATOR, - CS35L56_INPUT_SRC_SWIRE_RX1, - CS35L56_INPUT_SRC_SWIRE_RX2, + CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL1, + CS35L56_INPUT_SRC_SWIRE_DP1_CHANNEL2, }; EXPORT_SYMBOL_NS_GPL(cs35l56_tx_input_values, SND_SOC_CS35L56_SHARED); -- 2.30.2