From patchwork Thu Sep 16 14:38:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 513057 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 8EE35C433FE for ; Thu, 16 Sep 2021 14:40:21 +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 29C0A611F2 for ; Thu, 16 Sep 2021 14:40:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29C0A611F2 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 C6B0417E1; Thu, 16 Sep 2021 16:39:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C6B0417E1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631803218; bh=0X3kpnizMEqpdAGwiy3i6bfLojY5A0w5gROUO13B+RE=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=XbgFEbjWR2LlZN3AUeSr1n3DKJ+K6WFZ9CwvyQyKQ/mqoeFWbUbWPtsfEPClsWSXN lM0DkA4DDuNdoHqrVjuh5LHV0+vY3TSlSaWU/DNlv8n48Cl4K/t3xB8I+ZjjDBebRF NxihdoOEyUSwfopFkOcGq9m5sikZBMvB3T2+UQcA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 59970F8025A; Thu, 16 Sep 2021 16:39:28 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2AF54F8025E; Thu, 16 Sep 2021 16:39:27 +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 9D54CF80117 for ; Thu, 16 Sep 2021 16:39:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9D54CF80117 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tdwJu+qw" Received: by mail.kernel.org (Postfix) with ESMTPSA id BFB53611F2; Thu, 16 Sep 2021 14:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631803161; bh=0X3kpnizMEqpdAGwiy3i6bfLojY5A0w5gROUO13B+RE=; h=From:To:Cc:Subject:Date:From; b=tdwJu+qwpNAAK3yUECc88nkXXaLqLKDKzPIFBc1xI1fRCe+iVP3fdDiuX5tlCuFQJ nFebeMao9C2ANYT/U9U1SkiyUGoy+5GbXoAZfoR8RiKe9g7MEc8OBVaT0WP7v7iTCT EdtUMUSS8bHqxATWpvbdMZTgNtDzVkBuNXf9cETtoqULhjgLr02NxZRPO9b8uZCLXI CISazn+Z+eqrg7OnVrKm/dQtteq6LJ88sR7/d0Xeu1DyZmqGr1t5dNrmmypWNbUMH6 g/0DTKQ8MTe+xAf25rxQ6matPPfvPVuGWLqWkveLOdoXywgoR3zWEIr0bLLwnXvcFU qBpbTnKxQxSYg== From: Mark Brown To: Liam Girdwood Subject: [PATCH] ASoC: ep93xx: Convert to modern clocking terminology Date: Thu, 16 Sep 2021 15:38:28 +0100 Message-Id: <20210916143828.36215-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=2116; h=from:subject; bh=0X3kpnizMEqpdAGwiy3i6bfLojY5A0w5gROUO13B+RE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ1YcMvWuIRFFbL5ZA7ccCvndS0uAnDejwNEqFxv6 HXPDE/mJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNWHAAKCRAk1otyXVSH0BKkB/ 45E3Zf3godjmyaVcRHABUbBMVYeYaqiupUEenZFFGNZOfekqjSVkPNwpdTGHIvmdNP0hut3e7vWk6R j3w6jdwmohRSdkN7+Ld6HxX46K6QflQ0LxRHVJ+nunuFThNH1aE1tL1c+EXWNwl1D9+6uHgG90NSb/ GNJiaAPxlhmXgx13TcFCDmADlJBe/K6IoNy6ukTx+fNQXc4rYZBA2Ut/Zeboiy7AjhP+3LYMEzAK+k M/5XNdZjsz7D1oWZoh7k0ET6+0cNzO8TBs8TrVsP6b/hu0L6W25ugrWgnx4aOcZZ3+b6GqpNvD/5FS 1FQETfNbs4Uy79M1lIsYq0u6lZmiN+ 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 the effort to remove our old APIs based on outdated terminology update the EP93xx drivers to use modern terminology. Signed-off-by: Mark Brown --- sound/soc/cirrus/edb93xx.c | 2 +- sound/soc/cirrus/ep93xx-i2s.c | 10 +++++----- sound/soc/cirrus/snappercl15.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/cirrus/edb93xx.c b/sound/soc/cirrus/edb93xx.c index 7b6cdc9c8a23..385290202912 100644 --- a/sound/soc/cirrus/edb93xx.c +++ b/sound/soc/cirrus/edb93xx.c @@ -60,7 +60,7 @@ static struct snd_soc_dai_link edb93xx_dai = { .name = "CS4271", .stream_name = "CS4271 HiFi", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, + SND_SOC_DAIFMT_CBC_CFC, .ops = &edb93xx_ops, SND_SOC_DAILINK_REG(hifi), }; diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 0d26550d0df8..06c315a4d20a 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -245,14 +245,14 @@ static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, return -EINVAL; } - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* CPU is master */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* CPU is provider */ clk_cfg |= EP93XX_I2S_CLKCFG_MASTER; break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Codec is master */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Codec is provider */ clk_cfg &= ~EP93XX_I2S_CLKCFG_MASTER; break; diff --git a/sound/soc/cirrus/snappercl15.c b/sound/soc/cirrus/snappercl15.c index c4b112921661..a286f5beeaeb 100644 --- a/sound/soc/cirrus/snappercl15.c +++ b/sound/soc/cirrus/snappercl15.c @@ -70,7 +70,7 @@ static struct snd_soc_dai_link snappercl15_dai = { .name = "tlv320aic23", .stream_name = "AIC23", .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS, + SND_SOC_DAIFMT_CBC_CFC, .ops = &snappercl15_ops, SND_SOC_DAILINK_REG(aic23), };