From patchwork Wed Feb 23 00:16:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 12756082 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 A2579C433F5 for ; Wed, 23 Feb 2022 00:17:40 +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 D859718D8; Wed, 23 Feb 2022 01:16:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D859718D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645575458; bh=5oLrvBGlk5TtiifvBYJmnZEBp594/9M24c1f9iDTbbc=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Zg9HztrGM0hge4YJsAa33NHsYT1k31blnWEvMub/CpCLdGCaxzY/1eKpcqxgY6NbE bj+9r3hVn/bVi+cX9akOEJNlRlepuXtDMbxvf7KYLYZxPaerLXQd4gxUpbV6RBd4zx 8dCrx3pc//E8bX8FmRUjQAp3dFkGcx8bfGF2UE5E= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 88FADF8012C; Wed, 23 Feb 2022 01:16:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D6C0BF801EC; Wed, 23 Feb 2022 01:16:46 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 8A4CFF800D1 for ; Wed, 23 Feb 2022 01:16:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 8A4CFF800D1 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LmXlBYuz" 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 dfw.source.kernel.org (Postfix) with ESMTPS id 13E6960FB6; Wed, 23 Feb 2022 00:16:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A424C340E8; Wed, 23 Feb 2022 00:16:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645575400; bh=5oLrvBGlk5TtiifvBYJmnZEBp594/9M24c1f9iDTbbc=; h=From:To:Cc:Subject:Date:From; b=LmXlBYuz2eKU6Y81K+LP4fngIKRQdPzaXtqkiaYihQ7ZqZyVLIyOSC0mB32GQ9Ik3 Sic97o2kZJ+L1Ocw0ybptSe2kXqT3zDUZJCgfItSsheFgTn8iiPZu/gM+awtcns9AD Ni9tp8ZUGLORMEbQu9vR30/0smmQ33JFZDgnQ/lVTBbSaU00G/Ylr8wWT8JfaZzxi3 xED+7R7F5O5ocQQhXk5tsvrFTqk3feLVf6aFh/IJdzh5jGkPpiJY5awGing3zWc+64 TYOUmteCMtWpKTUiv3hZ0G67QQ7Bf3zeA+5VYWxCI349oIc0zhW4EKMMXAwdH1OIVQ km1X8aVjmo5xQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH] ASoC: ml26124: Use modern ASoC DAI format terminology Date: Wed, 23 Feb 2022 00:16:36 +0000 Message-Id: <20220223001636.1321505-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=990; h=from:subject; bh=5oLrvBGlk5TtiifvBYJmnZEBp594/9M24c1f9iDTbbc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXyg1IZHdoq01JOBQTTeCiaUTuw3U8YeDfGc8a3e a4UpQFCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV8oAAKCRAk1otyXVSH0GlPB/ 9xJGmYlYwjgMVKKNzHRN928cLlkPKCIExFRQY/sVHZrdan/tkyCpOdVA9BNMBZhg62IIMY6v9t60Hh ar+Mw6IfIdd/jwaiu/idJimIfn9+fd9Cu6q61FxWhdPcsXj1JbkXjnXabCQN5Elcdiyr7WETD7GXKu g4mOyLF5XD8wgHZ9mwIf4zECn9mSzNwBYuV8uEdfcWWRUrPK5asWRApWEDoFfjb1rgU6anlNlicNDD 5+Jo0/yeTpUmfU+gc5kzzwFJc32NdILss8WEeFSHfUY3DdnHjtV+ztszaXhlHD2m0o6iyRgNAPPvHf 5ooDz+mlTXPDTRmgGlkVmp4aAeduCV 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 ml26124 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/ml26124.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/ml26124.c b/sound/soc/codecs/ml26124.c index 4d7c0be2a4aa..0823527e4a75 100644 --- a/sound/soc/codecs/ml26124.c +++ b/sound/soc/codecs/ml26124.c @@ -402,12 +402,11 @@ static int ml26124_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned char mode; struct snd_soc_component *component = codec_dai->component; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: mode = 1; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: mode = 0; break; default: