From patchwork Thu Sep 16 15:18:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 513055 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 248C4C433F5 for ; Thu, 16 Sep 2021 15:20:54 +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 952986113E for ; Thu, 16 Sep 2021 15:20:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 952986113E 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 38D4B18A1; Thu, 16 Sep 2021 17:20:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 38D4B18A1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631805652; bh=ja12kU6CmXJCz//xEIz4FdZ0hXnKUgwz4H6mKM/yZFQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Hmvn+YIlFMH9k2llVkm/yvoc+e73QrXNooPGJmJ2qN+8G1Msk2erjk4WwbbY8yHqi pVcsurU3+NOMIMnJE3Gh6sPtpB7zUcRYciTr2eflgCzgl/uWECpmBf2/S7h1XWeywJ rvDMdga3LoGMoUh7bEZykjd1MN4JVdb1CJSFv4Hk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1FB10F804E6; Thu, 16 Sep 2021 17:19:03 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 2049FF804E7; Thu, 16 Sep 2021 17:19:01 +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 7D80EF8027B for ; Thu, 16 Sep 2021 17:18:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 7D80EF8027B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="plFE9Psf" Received: by mail.kernel.org (Postfix) with ESMTPSA id 99A096124B; Thu, 16 Sep 2021 15:18:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631805537; bh=ja12kU6CmXJCz//xEIz4FdZ0hXnKUgwz4H6mKM/yZFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=plFE9PsfzmbcTgInPJNF0loU5vrF3TfLzQNrocmpXX7b+livDW3FMDH3mxnY+XPC1 6m0Osd4RQebWRFkRrjjuR0GP93ZQEvTG6mXM7FFM5/92t+W5cOWQDJLkcT7stDGv+Q STo+RIPGw8v/3cE2Q5lTRj0up13fY3hxSq7+y7ZhewJfDwQnXqPSYBwTXwoPmZwQk8 uJYA5NZPeyeUHjc7qdUJ921VE5gVg9jzxV1SKJN+/RkuQKpq5LLaPuYS14ewmgh/70 wtlPMe4uECro56lWydq8xrFL4u82klLQqH8ufZ8laRNKQomYubMJH73yJy9aGOqjiY OwTXwM5ugNi6Q== From: Mark Brown To: Lars-Peter Clausen , =?utf-8?q?Nuno_S=C3=A1?= , Liam Girdwood Subject: [PATCH 3/6] ASoC: adau1701: Update to modern clocking terminology Date: Thu, 16 Sep 2021 16:18:03 +0100 Message-Id: <20210916151806.20756-3-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210916151806.20756-1-broonie@kernel.org> References: <20210916151806.20756-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1085; h=from:subject; bh=ja12kU6CmXJCz//xEIz4FdZ0hXnKUgwz4H6mKM/yZFQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ1+p8Fa/CM9HwAbbPLTON70donHN7KXlVYB/EdwS ic37aqeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNfqQAKCRAk1otyXVSH0CYkB/ 4xQ+SSuIXQmpdmCiV7P88JcHGhepqz7QfYSA1Wy74ZhL3Ya5TkAJba3KS8Yyh0CphWRSHL42dtO6hQ qEP45+97ifMtnqqkpg0P447FfcBKQca+ph/PKA4fU6TrjHKdT7NLQQnES/6F2xkOb/KtzMXsRzWJpu 1AMOs/uQVQmzXqTMOXzEW5+8HH7qRIED4dzlp3g8m/bgypZYNriQGoLJ6gwT4CeyYcS07MC+tpyqXA Fe/HNX0htKB0sB1wHbiYjqHyDQK4AG5Ql+9vj90+Dsf4ufB5S1fizSTu0uWzCcLjAxRBXiF22WzyGc S/WcPKAmGUZXFkQp7vxceDF759Y+7a 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 adau1701 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/adau1701.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 5ce74697564a..c5bf461c0b7e 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -482,13 +482,13 @@ static int adau1701_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int serictl = 0x00, seroctl = 0x00; bool invert_lrclk; - 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: /* master, 64-bits per sample, 1 frame per sample */ seroctl |= ADAU1701_SEROCTL_MASTER | ADAU1701_SEROCTL_OBF16 | ADAU1701_SEROCTL_OLF1024; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; From patchwork Thu Sep 16 15:18: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: 513054 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 6FD11C433F5 for ; Thu, 16 Sep 2021 15:21:25 +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 E7D3B6113E for ; Thu, 16 Sep 2021 15:21:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E7D3B6113E 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 887A518CC; Thu, 16 Sep 2021 17:20:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 887A518CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631805683; bh=7ND8+x5ohSVv865HcZjPNRfhInmEqN3znp6iMFLRZzo=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=N/PSoeq7CXU09W1PU5kkVPQ/X90KE4z+DUm7FMNw+FVrRyjXbgrV6ZBRo74yfxCKK ZwPbwKqnyqslOawRR0sc0j34mBw9oMRCSi2hSLXJPLDaiMmaDnvW8Vbu+r5ScaLNcE zkAvmymxJcvT3pdjl7TT3n/nV/pGzy3mNZJu5hug= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8AC71F804CA; Thu, 16 Sep 2021 17:19:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 5DCD7F804ED; Thu, 16 Sep 2021 17:19:04 +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 374FEF804E2 for ; Thu, 16 Sep 2021 17:19:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 374FEF804E2 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Mo+KgcMz" Received: by mail.kernel.org (Postfix) with ESMTPSA id 35F0861246; Thu, 16 Sep 2021 15:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631805539; bh=7ND8+x5ohSVv865HcZjPNRfhInmEqN3znp6iMFLRZzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mo+KgcMzwS/LhpKhiQCaoxvxv2uxhpJycIcLPm7EkKwyF009+hMgpAclUMwZp+/bS WDpCceVlknI945ompauv/XPLFGJZ8KbbctHEfir8oFnOlSexVPqB3Qnpy/c26g2OIK vbR+e0fACIkAW2lZ1LIdNSQs85r2TP2DzYGGLc6AueBICN3mNnjdCqjYiSD9y9Fx+R oykNxv6aw8MnXWnF1BtHFuNOpsBiV7M1XFUXmJe9TI0xcvqGmsCCtth2W7n6Ctn4JZ 4/HywtuCsfzgeIB08QLpuEzyoWJ8g+RK1lAB3/dHi/+vsSrCtnAc1DKVtUXAI71amx NKVLTHcmcfV+g== From: Mark Brown To: Lars-Peter Clausen , =?utf-8?q?Nuno_S=C3=A1?= , Liam Girdwood Subject: [PATCH 4/6] ASoC: adau17x1: Update to modern clocking terminology Date: Thu, 16 Sep 2021 16:18:04 +0100 Message-Id: <20210916151806.20756-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210916151806.20756-1-broonie@kernel.org> References: <20210916151806.20756-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=976; h=from:subject; bh=7ND8+x5ohSVv865HcZjPNRfhInmEqN3znp6iMFLRZzo=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ1+qTlVGaM86FSVIWJi/QOpu9/4c/iemRtjFZ9h6 CA+L0VmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNfqgAKCRAk1otyXVSH0OciB/ 9Imfey9ng7taRlCbz36xMCyurLzZH5M++qlUaglYQwQMBpf0yOFHRD/mBZBiAKlxxliGQFHtikJ/1H Wcfb1N3f5ldivGgaDrLLHmaCcOYCSB28PDT69LrGMB/JWydF3mar53BQxxgIv90Ug17vy2TvPIEw6L C6RLzMaFISwfyaMbF8aJzDhWiCgXXXNMgjEm/KTQY01LbRKx0VrMzf2/DNDYE4NYN+QBKEWytvf7pP O1rLega+ExI7uoY8YNjYiIGkIGpCaJYxoM7V6Vr2pZsUXWeNueiA0B7dDfFV8JL+VIvJFjMGCgdkkI UOWDYXNeq0C/y9+2xKY2iOJ3qOppJ8 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 adau17x1 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/adau17x1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/adau17x1.c b/sound/soc/codecs/adau17x1.c index 8aae7ab74091..af05463af4ac 100644 --- a/sound/soc/codecs/adau17x1.c +++ b/sound/soc/codecs/adau17x1.c @@ -556,12 +556,12 @@ static int adau17x1_set_dai_fmt(struct snd_soc_dai *dai, unsigned int ctrl0_mask; int lrclk_pol; - 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: ctrl0 = ADAU17X1_SERIAL_PORT0_MASTER; adau->master = true; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: ctrl0 = 0; adau->master = false; break; From patchwork Thu Sep 16 15:18:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 513053 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 653A4C433EF for ; Thu, 16 Sep 2021 15:22:06 +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 CF8BE6121F for ; Thu, 16 Sep 2021 15:22:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CF8BE6121F 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 6C6D218D5; Thu, 16 Sep 2021 17:21:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6C6D218D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1631805724; bh=eDXzELLedHL1Rq69xdJyLrhmmCJYQrmfdmd4yJBB9LE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=VLp98gmMCcN97ELzT8Eo6qZhe93dwgusWKmBtuwY48GqOR4/shVi9sm+cFxRWCJKH Ok+FKCDkBJC5+kxGe37wPOLDFJlK3MfnQndru6PWONSA5Y0T09LKAuhTytYJEn4WW/ 6SFbjCMHKVlFeqRENqrkX3YWJ/CEkYyHLPSYmTwI= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1C5AAF80506; Thu, 16 Sep 2021 17:19:12 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 14600F804FB; Thu, 16 Sep 2021 17:19:10 +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 54D94F804FB for ; Thu, 16 Sep 2021 17:19:06 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54D94F804FB Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B8qqIRyR" Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FCD761248; Thu, 16 Sep 2021 15:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631805544; bh=eDXzELLedHL1Rq69xdJyLrhmmCJYQrmfdmd4yJBB9LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8qqIRyRkswmmaTgHEEd/uDlXHFabOsTC7yjpuP9ibwswyecHLOBYBnJpKwpxve9C JkuxKqQNsXPMvQWJg//ak1TPGVuc+Sjxf+c8oNZht8vHhrsWZ3cBdh2GufwxRq9pSR BLKs7IQfYqbaAcY/bzHuo4TALT5GcfLg3AMX9W0ASjRGQIAVG90U/+z7hNl3FJnsKU h9Tri2vDRKnVC2sT1Yoel6qNLY3bpsYj8FgNQo4rIVE+XgFmiqe6DzK1hV4naafwDR gDNi9JAGAVXufrIWcOxVXWtI87Yq4y4HZ1g5JY1dxrRkUwkLF26taVL37wIn9XY5K6 dzwvELQRofVfw== From: Mark Brown To: Lars-Peter Clausen , =?utf-8?q?Nuno_S=C3=A1?= , Liam Girdwood Subject: [PATCH 6/6] ASoC: adav80x: Update to modern clocking terminology Date: Thu, 16 Sep 2021 16:18:06 +0100 Message-Id: <20210916151806.20756-6-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210916151806.20756-1-broonie@kernel.org> References: <20210916151806.20756-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1020; h=from:subject; bh=eDXzELLedHL1Rq69xdJyLrhmmCJYQrmfdmd4yJBB9LE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhQ1+sjWzsvq4K2hc77B5GuMyqH52WZBlRqQaNGil6 ZWNtt36JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUNfrAAKCRAk1otyXVSH0EbAB/ 9XoaRelhc2L3sQQWyAqfId+VaAG5XEtVtzVkYiIs/6HKsWQL9Frnl2D28XWJPiy3Muhdo5Xef9mqFN fNf4+GO/ItDBBBtPBk5O7wEbmhjj+hJo6PEpxBPpstQtU2dyCPrfw5rYabRs6F2llCXl4YZ/IJKIqd 8LyYL7t61bwsH/3o5p0zkh/j1tCAjbkx7365c85cr8jU4oQnDZCJcD5/iu7hezgow0sShBIcDTa/+z TO/213oiY5UfAIOA4fUG7D8GNc10wFy4WVvrbC7vlimoOrlHHaUWFPoTh8KqnTHSQf26j1PPVD2yel SFGVdNeydQmfx7Sg/Ao7OZ9V79v2xC 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 adav80x driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/adav80x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index 75a649108106..90f3a5e9e31f 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c @@ -369,12 +369,12 @@ static int adav80x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) unsigned int capture = 0x00; unsigned int playback = 0x00; - 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: capture |= ADAV80X_CAPTURE_MODE_MASTER; playback |= ADAV80X_PLAYBACK_MODE_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL;