From patchwork Tue Feb 22 23:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545264 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 EEB14C433F5 for ; Tue, 22 Feb 2022 23:42:52 +0000 (UTC) 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 3CFEE18D9; Wed, 23 Feb 2022 00:42:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3CFEE18D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573371; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=svPnFv3afxcsGLjvmddoHSy4776p2Xta4x5lt0sEt/lTUFZN3triozi96kzr8M87e +dJE7OSTZQ9p8p/yxm/9PPU83/nIJ2I2ClBjJj/Ax2NQnHz+onaqwkV1Mg4SGc9gFz 8cMdg+iYHCSdtAOqTg1UojtKKNGscrye+yLDJWs0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 247D2F80520; Wed, 23 Feb 2022 00:40:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F1826F800F5; Wed, 23 Feb 2022 00:40:43 +0100 (CET) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5E539F800F5 for ; Wed, 23 Feb 2022 00:40:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5E539F800F5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XYMF4aWo" Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 84701B81D63; Tue, 22 Feb 2022 23:40:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A68FC340F0; Tue, 22 Feb 2022 23:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573238; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYMF4aWoRz0igRCDoQLOM9+zkQUFjulE9+leL88ys+TRYsCr5ezCasbYsIY/8zvxY eCqu21rfa4eMsWIWpUJM92LRqiu6ObFQOFpDtCDVY9Kewk44KjXlpmsEzVQWZ8QM6D 4WICeUZkiKwFmShF/Z/3u+KNjPFc4Oe0lmGxCcVCL0rxFyMjTz5eW8c1M5jjVI+VXo lkjY1AZfoAnB4gOyFoLh4zE37skWXSdrmBJFvLf/mSyCkhlvA3Rxvyvn73R7nsN8Bt jOz0Nn+BCtR+fCIExpJE9ODGZ3A2UbgahXdknJXWLmCWMw1gZ080ib+bpv9NjyD1Zm Z2qPkAfmy8L5g== From: Mark Brown To: Liam Girdwood Subject: [PATCH 05/10] ASoC: max9850: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:21 +0000 Message-Id: <20220222234026.712070-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1066; h=from:subject; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQozkG49wUmPcw5jU6ouTgcomKzQkEbUUAP0P8B oNaU39mJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KAAKCRAk1otyXVSH0OFLB/ 4xJcYpRD5l+IZWnWBHdVocOG+MtKQ484pr1B439FMX2AGiuZ6EACvBdRj4idKXrpWMgw1wErzjP0Ef WlfpqicsM6Md8+PQPXFaaGSxgRJSBxKZ27qoZpLv9+JXU8ar0nAGBxek6TZtH4yXEcqOhE6pNYmsfb 6EM9al1ABYbaS9KtHjUwGOe/IHLExroO3OcrqPYbi2dRJ4FzcBkeQlI6llO9q0ieSpTMnMk+1xdn6K ef/CotXVW20bu/g2AckAnofjvZAqeIApg8TABM7/zRuOrUZ4Go74M/kA2m4HBCsbjwaviOV74V6hSg JDeGaEA3AMcO/cKofGJKRmFzKbswP/ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max9850 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max9850.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index dec51893af74..e073f0e029be 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -173,12 +173,12 @@ static int max9850_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) struct snd_soc_component *component = codec_dai->component; u8 da = 0; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + /* set clock provider for audio interface */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: da |= MAX9850_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL;