From patchwork Tue Sep 21 21:35:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12508893 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 344B3C433EF for ; Tue, 21 Sep 2021 21:38:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5856361159 for ; Tue, 21 Sep 2021 21:38:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5856361159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D1E7E168A; Tue, 21 Sep 2021 23:37:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D1E7E168A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1632260303; bh=P9Ovn67dgqfY8uXNhC7cS74K5PnBw7legwEUgP0ObyU=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=odZBPI+o5jdK3/bZdtvsxTMqowAb7iwEqYlpnf7v6LKnn8VQS1Vye5a6+G6RgBfJQ Y8UtpykxkPc8vdf2hioNeFcP4Nw5kK+GeN3suRG48NVMD+H1FJ3oROVzjeOypFk8aL X2PqHVgbxJ7JOE8Ws6mJZcjc0+0oYDfwc55r+U9s= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C2165F802BE; Tue, 21 Sep 2021 23:36:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3300AF804BD; Tue, 21 Sep 2021 23:36:55 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 69B22F80124 for ; Tue, 21 Sep 2021 23:36:52 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 69B22F80124 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BM+WZmOt" Received: by mail.kernel.org (Postfix) with ESMTPSA id EB6FB61019; Tue, 21 Sep 2021 21:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632260210; bh=P9Ovn67dgqfY8uXNhC7cS74K5PnBw7legwEUgP0ObyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BM+WZmOt5xnz2Os+TA8gO7xWletdWiABtmeL17sjiVUSjF1MjAVgUj2o9w2MZflMy khgJ/G1Ywn4tC0Dh9Wv+WM0QFKiU6HCYQRmCGa6TmjccbSBRjWqqZt7CfKbRuHasEs 1g9EZZrSZPA/Z+pL4J9QRc+T2zjv0AQFuYXn1QQ1iccY8DbYJGm+lA8R0/9EYU4DNB +MqRSSpT4wmhBTZSW+TkbmSaUcs8pcXb/A6O23BfLVaSNQ4K1fXzTyvkwqCMnx6EBo lkgIpJSGDeYjZtUv8kiatOU0O3zRPxWOkQTOrjBrKroGEVg+TnsmOuuXgAh2bI7bL1 bGtwUXpkXK7eQ== From: Mark Brown To: Liam Girdwood , Nicolin Chen , Xiubo Li , Fabio Estevam , Shengjiu Wang Subject: [PATCH v2 03/16] ASoC: fsl-audmix: Update to modern clocking terminology Date: Tue, 21 Sep 2021 22:35:29 +0100 Message-Id: <20210921213542.31688-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210921213542.31688-1-broonie@kernel.org> References: <20210921213542.31688-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1028; h=from:subject; bh=P9Ovn67dgqfY8uXNhC7cS74K5PnBw7legwEUgP0ObyU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhSk8U/VULECrfRVtYmjLkQHqSef5Im/jvNVDsuT2f q6fnzNeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUpPFAAKCRAk1otyXVSH0Ip9B/ 40JcBPo/Iy2pwoa3fgS1cUud4yUnNFMtNvn9E4E2JgzGOFo3JpjVs+4QU8XHWopOpdu6sWEZgozuHY AGGSSrAE4KXO87agaRGQZPo+ZentL9kWFleAvPcZbg2TlpJoPKucYqTaiOKbF7zKZJjnrzK0E1f+ZQ t4kkOO7nzVZIlRGt4D4qkjxu5QH353zqqN5+Kd51flzKn+cjFeCS9g27HGgCLhAcQPzePyXajYoz9q 11XbZSAkEAyLnyZh1RaWUqnDIxbZ5Hw5KXEWajZl6RDu7YUdk/Ga1yM6FIZa41k2jGMJRk8Q7zchnn vboXrJ+TzwzPjknVnejDk5hEkc1lSK X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" As part of moving to remove the old style defines for the bus clocks update the fsl-audmix driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_audmix.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c index f931288e256c..6dbb8c99f626 100644 --- a/sound/soc/fsl/fsl_audmix.c +++ b/sound/soc/fsl/fsl_audmix.c @@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - /* For playback the AUDMIX is slave, and for record is master */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - case SND_SOC_DAIFMT_CBS_CFS: + /* For playback the AUDMIX is consumer, and for record is provider */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL;