From patchwork Thu Sep 16 14:22:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 513058 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 62C66C433F5 for ; Thu, 16 Sep 2021 14:24:18 +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 819F561207 for ; Thu, 16 Sep 2021 14:24:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 819F561207 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 7D875188B; Thu, 16 Sep 2021 16:23:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7D875188B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631802255; bh=tR5BN6pgzVJCIm9MS564ZUOdzytE4hVR/sjg3FzV7Hs=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=NA5cQNuj0qnsgP+Uw+GuSwqMMd+ATIDntkd9p++oAGk9SIFxHs1PlcBxiseLxnuvO wKiQMdGrVwfRnVX69nihWXlSc73oNJrmFcScp70YTVU/jCAw7KAcgStJyYPveQwPrz kCH6umclTQHMGh5RBzRumKL2FZdAluN2ztoVU3RQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 17E71F8025A; Thu, 16 Sep 2021 16:23:25 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A12CAF8025E; Thu, 16 Sep 2021 16:23:23 +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 44DF5F80113 for ; Thu, 16 Sep 2021 16:23:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 44DF5F80113 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z936YNBg" Received: by mail.kernel.org (Postfix) with ESMTPSA id 89AF961207; Thu, 16 Sep 2021 14:23:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631802195; bh=tR5BN6pgzVJCIm9MS564ZUOdzytE4hVR/sjg3FzV7Hs=; h=From:To:Cc:Subject:Date:From; b=Z936YNBgXnlY8U1NiGZgOB+wwboLqye8TnsgTVpKEwRmeYq0KxXAQ2gssAC6AogLr KvUFNlEGdLenYPtdBkC2M1BufFRzEDtNYnfayPwshCsLe0qivX/y5vTQxkhUhEWDdz 6/+lynlTa6fjEGVL/PyqUBeDIuI+BM3lljsugeqAMjKp1yKRys2PRD1lRjhBsHGpVy PmE1lDdPR1lGRDOjWExIi2bCSMU0cO3WEGlxkQw1p5SsoyUnBTNMEn0tWVrWBG2RnX R7DWKgePYOEGPeY2w+N7Th7amP0C66JmUCSC2JJKZLABQ5XEaB2RM2GbBI/WfxPobB h8qOrKpO2Bp4A== From: Mark Brown To: Lars-Peter Clausen , =?utf-8?q?Nuno_S=C3=A1?= , Liam Girdwood Subject: [PATCH] ASoC: ad193x: Update to modern clocking terminology Date: Thu, 16 Sep 2021 15:22:32 +0100 Message-Id: <20210916142232.33914-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=1510; h=from:subject; bh=tR5BN6pgzVJCIm9MS564ZUOdzytE4hVR/sjg3FzV7Hs=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ1L/YUv/9rWl/SbQrMzWsDTV3D4EJ3bxIu5nOCxd nYjUziyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNS/wAKCRAk1otyXVSH0MIZB/ 92kfM18EFQ4U66F9P8Ln8quwrwmSDU18dWeoYV4CBGAs7CQft2phLZf0dqtfS9gd8NWt2ErcGWMbXe PhOBAdeKFpU5u0t5yI1epNjmHLviyS1qfx2/aaW1j9oSubI9ybK8ZD/PPKN06VaLyWjIbWVv9rFobm HetW2NC6hBCTfUfrgr/5QZFz6czo19j8zGQZ6NnVIj81hQMk95QWYvQ/iRsFH8THaAsTB2l+U2pXjP NSHlYs+Rkh9uOeI0vsosLysakdWEK/1yK8T+oHtmQxOB3DiFU1h57LGOZXW2Y8KKzOqzmpzEK1aA+R ztxPA8t65j5xV8sJRu7sUG9AmazLMY 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 ad193x driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/ad193x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 278a55af158b..30b98b4267e1 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -243,22 +243,22 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, if (fmt & SND_SOC_DAIFMT_DSP_A) dac_fmt ^= AD193X_DAC_LEFT_HIGH; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & frm master */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: adc_fmt |= AD193X_ADC_LCR_MASTER; adc_fmt |= AD193X_ADC_BCLK_MASTER; dac_fmt |= AD193X_DAC_LCR_MASTER; dac_fmt |= AD193X_DAC_BCLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slave & frm master */ + case SND_SOC_DAIFMT_CBC_CFP: adc_fmt |= AD193X_ADC_LCR_MASTER; dac_fmt |= AD193X_DAC_LCR_MASTER; break; - case SND_SOC_DAIFMT_CBM_CFS: /* codec clk master & frame slave */ + case SND_SOC_DAIFMT_CBP_CFC: adc_fmt |= AD193X_ADC_BCLK_MASTER; dac_fmt |= AD193X_DAC_BCLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & frm slave */ + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL;