From patchwork Thu Sep 16 15:08:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 513056 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 F3B45C433EF for ; Thu, 16 Sep 2021 15:09:51 +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 2D6B061108 for ; Thu, 16 Sep 2021 15:09:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2D6B061108 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 92C011888; Thu, 16 Sep 2021 17:08:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 92C011888 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631804989; bh=7ik/e25uzON0Js4Ojoci9rws5U8Y8jX5d+rGhB/WV1k=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=giJ95j9WRTxKXveIKxsoCgu4HsKkIfU4C1QDsWEsu2MN6B4e+Mo8WiXjZv4xN7Ga2 ELvV9sH67jFXoVzo5+Ogjk2DOH1lU1n5bXeg9KxRVI4ZXdXyDfehrzzFR9xyKn1wUM dUkMuktkrMWvsjalQ+WaDMNg//PasK0DEl040oW8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2FAE0F8025A; Thu, 16 Sep 2021 17:08:59 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id ECA0AF8025E; Thu, 16 Sep 2021 17:08:57 +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 7B257F80117 for ; Thu, 16 Sep 2021 17:08:50 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7B257F80117 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qsS0VFCK" Received: by mail.kernel.org (Postfix) with ESMTPSA id 35BF161108; Thu, 16 Sep 2021 15:08:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631804927; bh=7ik/e25uzON0Js4Ojoci9rws5U8Y8jX5d+rGhB/WV1k=; h=From:To:Cc:Subject:Date:From; b=qsS0VFCKHhXqBKSOzbibEZVZnBPJH3Utg5czklAixioQo1IjboiR3JZ9cl6vmcGWR kQ9StKcGZ1G/g1BnWZvCsngom0MY5XR2Q6fMqGN2HLDdRWdviRl5t/ffGxMUhyu5Le qF6Bfg+0w0ejj7Zi4ZmfkFNglLdWf9gmj/i/0nXtQkJVKpIIwo9pRpIsCOtwtao/xk yMC9FjuSe53GXk/KDD8JSkWkgAkSu4q+etlnlQ/NrfxB+koFt0XbADT8Wqipej9XU8 JQYD0Mye4h5bGJFFZ5zbfVl9mkG5/xpGXXw84BQXYFvVW6k5/jtvN82OKQPxwVlnOC rdUhZYpWQpcXQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH] ASoC: ak4118: Update to modern clocking terminology Date: Thu, 16 Sep 2021 16:08:04 +0100 Message-Id: <20210916150804.20058-1-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1808; h=from:subject; bh=7ik/e25uzON0Js4Ojoci9rws5U8Y8jX5d+rGhB/WV1k=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ11uJNeuxuUyvzyqrbegT6M//nvSz4ALuRjavl6y YGQ0ZwGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNdbgAKCRAk1otyXVSH0FFSB/ 9+AIF6W6e7rvsG56dIGrupK+fiOCon6qvqYxCEhKTJRN+xuBMKgZZA9I1k72wX2epRBF8xIy/kcrDN fZQ92DtExySzeeS0FMmgiOzEVNdFFMChEvLQYRIlyxwL7hN1w4lmcgYqoIhY+/DnaSEPejvayfvGqT 4+FEYOgHN4OH8ymWZ2vuDvqbr2jpeks8wZn35eqpko7FQlsxJu1VEMNYV7igzli6Mp4hJGNpmMePo1 g8o6FuD+jKYleXdaHaejOpIr5132rRK6+fgKACCA6ERT27unv7x3YJBB0x5eacMaeeZ8X7cCdGXN6C XFKYFrne1eqrUObgwY8JEGXoWYLMmw X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown 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 ak4118 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/ak4118.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/ak4118.c b/sound/soc/codecs/ak4118.c index 5d46ae85566c..e0a6451851e8 100644 --- a/sound/soc/codecs/ak4118.c +++ b/sound/soc/codecs/ak4118.c @@ -151,8 +151,8 @@ static const struct snd_soc_dapm_route ak4118_dapm_routes[] = { }; -static int ak4118_set_dai_fmt_master(struct ak4118_priv *ak4118, - unsigned int format) +static int ak4118_set_dai_fmt_provider(struct ak4118_priv *ak4118, + unsigned int format) { int dif; @@ -173,8 +173,8 @@ static int ak4118_set_dai_fmt_master(struct ak4118_priv *ak4118, return dif; } -static int ak4118_set_dai_fmt_slave(struct ak4118_priv *ak4118, - unsigned int format) +static int ak4118_set_dai_fmt_consumer(struct ak4118_priv *ak4118, + unsigned int format) { int dif; @@ -201,14 +201,12 @@ static int ak4118_set_dai_fmt(struct snd_soc_dai *dai, int dif; int ret = 0; - switch (format & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - /* component is master */ - dif = ak4118_set_dai_fmt_master(ak4118, format); + switch (format & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + dif = ak4118_set_dai_fmt_provider(ak4118, format); break; - case SND_SOC_DAIFMT_CBS_CFS: - /*component is slave */ - dif = ak4118_set_dai_fmt_slave(ak4118, format); + case SND_SOC_DAIFMT_CBC_CFC: + dif = ak4118_set_dai_fmt_consumer(ak4118, format); break; default: ret = -ENOTSUPP;