From patchwork Thu Jun 2 13:52:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578203 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 691C8C43334 for ; Thu, 2 Jun 2022 13:54:52 +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 7CAC417B7; Thu, 2 Jun 2022 15:54:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7CAC417B7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178090; bh=gqA2E3bevuaMWCPF3ghbWhTvmdOWnlf2YCeARAOeCms=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=tzn8xYL7pMTJF/bKAkCqTCTNwHFCA3LB7QBOWLCO07bDaKLSYw9pGWGQYf7JfOHkF qkdELuyb/sAGsAYM9PZq0PHCiLitdqqm86Loor6q+mUrAV8bq23QCFQk9LRCKHcoe3 34uYWjoYazCN2h4rGnrX1nfycYBvecMtqFh332CE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A6DA3F804D0; Thu, 2 Jun 2022 15:53:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 49820F80236; Thu, 2 Jun 2022 15:53:28 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id EAD85F80089 for ; Thu, 2 Jun 2022 15:53:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz EAD85F80089 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ohQATgwV" 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 ams.source.kernel.org (Postfix) with ESMTPS id 1A6F7B81ED5; Thu, 2 Jun 2022 13:53:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C85AC36AE3; Thu, 2 Jun 2022 13:53:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178003; bh=gqA2E3bevuaMWCPF3ghbWhTvmdOWnlf2YCeARAOeCms=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ohQATgwVmxAMNzELiUrc1v2mbU63sYPAiAZ0r8jabhaHR7yrlsnj0W/hs2DNg1JNg jIqUFZSeyIzX6QhdYWuu7xoohObu+u6s+mOOl1wmUcvVrT+rBuu4MMIBywmkMbalgB mh1wv+57hc0YqyieV2JrY9HSc9HiOepPpDJSeMwH6a4Fubkr15nZOpnjEi6kUX1UqS doRsEvwxar8cv+QdfrDDwoO5n7rjDzj3Ssxw7Z9geMlfikzDUvRAhRo9pj5VvEPRgE UZEl9TlftyXoQA5m+l0l3/Es0UkTMamADzqzAX9KOLVQ2Kpuv8xF7MYMhDpt1rgBMc 8RLjUM1SR8Lgg== From: Mark Brown To: Liam Girdwood Subject: [PATCH 01/20] ASoC: cx2072x: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:52:57 +0200 Message-Id: <20220602135316.3554400-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1649; h=from:subject; bh=gqA2E3bevuaMWCPF3ghbWhTvmdOWnlf2YCeARAOeCms=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCPys1+J1z1pKmrMbIMrJO9LFOwk/DLnky+iQsv 1mQPsxOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAjwAKCRAk1otyXVSH0MjTB/ 9UH6jD/bu1BZ/yOSjk36OHSmja58hpBT1dmlrO+MRgF/3a3PmYYzm4vxJW3J1F9QpmK0jG/kCTnyGf MfERsMDrD1p4N0CdwACmRu27Omemtcv/ySmP2XQsPScMaRqS7AVzPHEeZfq9VHCP5z0CHvMP3xT2Sn szPbtNciPfXFEyxwb92NI7q2MOBd3q+2H/8I/0ARpLa7oR+g7bO/Ua0EKcF3LEyVrGusmCB86SIZ5L 2P8jiSmtonqEA44iKpI444xzOZi/0VOp5YfcjqtCEbF3ll3Pg636tgND2sRIG1UB8e4QiA5rhfXCzG RNd0/ht82slpcSuVwGIXx6cN6VtBYk 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 cx2072x driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/cx2072x.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c index b35debb5818d..b6667e8a6099 100644 --- a/sound/soc/codecs/cx2072x.c +++ b/sound/soc/codecs/cx2072x.c @@ -710,22 +710,19 @@ static int cx2072x_config_i2spcm(struct cx2072x_priv *cx2072x) regdbt2.ulval = 0xac; - /* set master/slave */ - 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: reg2.r.tx_master = 1; reg3.r.rx_master = 1; - dev_dbg(dev, "Sets Master mode\n"); break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: reg2.r.tx_master = 0; reg3.r.rx_master = 0; - dev_dbg(dev, "Sets Slave mode\n"); break; default: - dev_err(dev, "Unsupported DAI master mode\n"); + dev_err(dev, "Unsupported DAI clocking mode\n"); return -EINVAL; } @@ -1009,9 +1006,9 @@ static int cx2072x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) dev_dbg(dev, "set_dai_fmt- %08x\n", fmt); /* set master/slave */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + case SND_SOC_DAIFMT_CBC_CFC: break; default: From patchwork Thu Jun 2 13:52:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578202 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 899FBC433EF for ; Thu, 2 Jun 2022 13:55:16 +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 9390A17C6; Thu, 2 Jun 2022 15:54:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9390A17C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178114; bh=F2pYS6kIWwAfwRbdvcqGY8oMDkGLureXRfIP8HCsUSk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fjD4HMhXAxnsTbPCxdGYFUXdGNaCgGni3A1rPnvkB2rhsF2M7sKLJLxwQ4RxCmdua LWjIcanxYXmik/w/+/wHLDMjfHrM9a4i+vDrtxcd91CWcWfmeyaDpIuZqnjoeTqDZJ 9N4mQyCg1VqNnjukt58mp/XU7c5zPgatlg34v/Fs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6EBEBF80534; Thu, 2 Jun 2022 15:53:33 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 67ECBF8052E; Thu, 2 Jun 2022 15:53:31 +0200 (CEST) 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 4AFA6F80236 for ; Thu, 2 Jun 2022 15:53:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4AFA6F80236 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cYZKQBXY" 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 328FE617CF; Thu, 2 Jun 2022 13:53:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F0FCC36AE7; Thu, 2 Jun 2022 13:53:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178005; bh=F2pYS6kIWwAfwRbdvcqGY8oMDkGLureXRfIP8HCsUSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cYZKQBXY5wtbf9ol/9sQYn0emU4Kceyh85hxPM9F79Kssl97btcgTfq2AabITWQlS it5/rrpD2ssDMoYG7YMEIjyovYnLJVbvGYmAJmd09BsuXz/WE0m/9pKVBZfktC8DHR YeUCKWYjV5s7N+mWQgmXrTf5v41a98CjhEUwuP8LmEyWhUfFGl0Iy6i9sLzE8nbYyW IU+BDj7dhF8nyuxwxYLlCh97AcalnsvOmk2kte4CP7C7jLILhgYhOU2vMGAlCyZKeJ NBIJFBKiI+Sl1IrNV5/+5714GD5PtupYfrgqyQG+oHcwvSTvVupcvljUnUqa8cHu8C M3G8H/x+YZZZA== From: Mark Brown To: Liam Girdwood Subject: [PATCH 02/20] ASoC: max98090: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:52:58 +0200 Message-Id: <20220602135316.3554400-3-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1683; h=from:subject; bh=F2pYS6kIWwAfwRbdvcqGY8oMDkGLureXRfIP8HCsUSk=; b=owGbwMvMwMWocq27KDak/QLjabUkhqQZB/orjuxiivLZUj7zZsUt155pNezvLhd86nGN83My83ng IuDSyWjMwsDIxSArpsiy9lnGqvRwia3zH81/BTOIlQlkCgMXpwBMRNiL/Q9fv4xwqD7bo+bY6X1O09 tuf1f8fsPE+5xlDrNd68J1kz2sVZPj6szD/4U09ThXnPc+0qD6/fHumh3HtjrO4FB9vLko5/ktF+Ve 1+9865VtRVrFFbUMZtZKs8/5U3HoHof0Xm+l9U2LZeOvnWtdvkflv05mU9Vd347gIsP03cX5QdlMXX f7Hm59pz/v0fp/f+fX+t0X0c98ftfY/tAbk6hiY9NLQW7t/vXfF1+eynGu9/sDkW6JAK7dMl07Natz Xxxbmt76ra18YU3W1s/WvfN8UlsU+s+bTw0WnvlE70ST4JVNReGMDOUdtk96FbQnR6zyK1B0PXDqK/ vkd/uq54TlsB0NXvTGVGFt5hkLAA== 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 max98090 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98090.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index 576277a82d41..72471cdb2229 100644 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -1591,9 +1591,9 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, cdata->fmt = fmt; regval = 0; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Set to slave mode PLL - MAS mode off */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Set to consumer mode PLL - MAS mode off */ snd_soc_component_write(component, M98090_REG_CLOCK_RATIO_NI_MSB, 0x00); snd_soc_component_write(component, @@ -1602,8 +1602,8 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, M98090_USE_M1_MASK, 0); max98090->master = false; break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ if (max98090->tdm_slots == 4) { /* TDM */ regval |= M98090_MAS_MASK | @@ -1619,8 +1619,6 @@ static int max98090_dai_set_fmt(struct snd_soc_dai *codec_dai, } max98090->master = true; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "DAI clock mode unsupported"); return -EINVAL; From patchwork Thu Jun 2 13:52:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578519 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 2ED95C43334 for ; Thu, 2 Jun 2022 13:55:13 +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 69BE917A3; Thu, 2 Jun 2022 15:54:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 69BE917A3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178111; bh=YKduSDen7FbKin2FCfE2CERL5rrvj0A2hBUTj0YQTRA=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=W8rkQSBtN0KQiCoTZPLz1jMUAJYMVETNVWqUNO7HPY9T7lkU/okzfIq8cRtXzaxZv znueiSNMO+9z9h+F7fkBqb4zGV7XBgJWyYoXD+7vQ+t1NsgaOZacgqER3YA9wM9Yrq 6xeHXMTduFe0P0Mid51+/bm1terLDnnhbv4qG5lo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D0062F8052D; Thu, 2 Jun 2022 15:53:32 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 240EDF80529; Thu, 2 Jun 2022 15:53:31 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0AEAEF80089 for ; Thu, 2 Jun 2022 15:53:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0AEAEF80089 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fuHrsqW3" 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 45924617D7; Thu, 2 Jun 2022 13:53:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62291C385A5; Thu, 2 Jun 2022 13:53:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178006; bh=YKduSDen7FbKin2FCfE2CERL5rrvj0A2hBUTj0YQTRA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fuHrsqW3KhIT3edEXDQhvowRzn2heVjlNjOo0SsBmUYCwxiM9I+RFJNW89FQPBkg4 oUazbjMeKjYU36Ba9DgkEbjgIkvuWY0q2sLiRg0XXx5DYQOt3X2k5KNhDCZmzZz/El MhOxetkdGtpwpAlLhRBuwUjXRWzlDEbHdWEqWBuL5WhCbpaS3CCChBHbuS9+9UndgK Tu5jqSNH3dbz9JuGjv7azXD4HtXlsTlUwYP0bqdlhmy+KzxDMUkqm4Am4KQsX9C9h8 4ILcVcnBqQy01kIe35Ksa2yHFxZ729tmPHpriNNLrv919YyxfqXdmjmyMEfvkIPr/Z b9TsqiqTEOSTQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 03/20] ASoC: rk3328: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:52:59 +0200 Message-Id: <20220602135316.3554400-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1038; h=from:subject; bh=YKduSDen7FbKin2FCfE2CERL5rrvj0A2hBUTj0YQTRA=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCQsAMBo2+J+HUgUcjNQUQqAt/GmAmcLnTOQSRo HTPBWECJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAkAAKCRAk1otyXVSH0CZ6B/ 9JR0xcwXxLMaiwMr4fB4A8LrBBwpQ8W4YgmNHXMCNf/K1agj5J6ky9JAS2MMyGu9nAzLgVypd5Rfqu HffCagZDHWqVd+JP4CgnsfIW0aS4KQMDTDXzFkg25y5NaofeTEI5SQzxD1YpSHGXguQ0/nAhYLsrYY vU6WE8ThYAOi00ChJiRxfWeSZdj/fsWkea2Zu0HFijg7/ppj8XS0vE8oarCKU/e0hijQU1nn5J8CeY DlV489MrSh4GjCP+JPDmkobe/EDAKPmTOc4AI9eZd3TOe9Z5uvjOqAB1EoO+Z8+bd/ll3WT/H+OtLq wwykv+t1+y4/OC82OY7qfSLLvJrAI+ 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 rk3328 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/rk3328_codec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/rk3328_codec.c b/sound/soc/codecs/rk3328_codec.c index 86b679cf7aef..1d523bfd9d84 100644 --- a/sound/soc/codecs/rk3328_codec.c +++ b/sound/soc/codecs/rk3328_codec.c @@ -69,11 +69,11 @@ static int rk3328_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) snd_soc_component_get_drvdata(dai->component); unsigned int val; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: val = PIN_DIRECTION_IN | DAC_I2S_MODE_SLAVE; break; - case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBP_CFP: val = PIN_DIRECTION_OUT | DAC_I2S_MODE_MASTER; break; default: From patchwork Thu Jun 2 13:53:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578518 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 86A6BC43334 for ; Thu, 2 Jun 2022 13:55:41 +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 C28D91788; Thu, 2 Jun 2022 15:54:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C28D91788 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178139; bh=jRLUgUntU2fruxLhA+W/LLYekTcTbLPo5lIlqi7/X/s=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=pUwxfWe/Qa7hPvKtis8Y7IMk5wiHm7qKQ67NdqlNayW+m+pywXp0Qt09Md88PfTnz LnCry82x3Wf/PSUSTJdzDiLhL9Q7E2SWa2tcN2Nene0Z43ZWWhDEmTuG6wEdBx6ZVU WqnIj7vvrtT0e5giTPM3Cgd4QIDK11VIqsHn857o= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 07711F80538; Thu, 2 Jun 2022 15:53:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B2806F8052F; Thu, 2 Jun 2022 15:53:32 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3E494F80272 for ; Thu, 2 Jun 2022 15:53:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3E494F80272 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WbWRBCt+" 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 ams.source.kernel.org (Postfix) with ESMTPS id 68908B81F5E; Thu, 2 Jun 2022 13:53:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76307C3411A; Thu, 2 Jun 2022 13:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178007; bh=jRLUgUntU2fruxLhA+W/LLYekTcTbLPo5lIlqi7/X/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WbWRBCt+QG7MAFHniAq/coqKZyh/SMERhCeoTKtDBRHtaHtGLnin/FNk7ov1HXgIZ JPPXujJEVFz/tqcF5lcw89C4keY4z4COFqCIqH1yamp9lfgE05dA5RkXwpds/SOZLQ 6HOT74a7Ba3glDHyL4xVvmc2bnGOEyKaeWSt1ypUwvCgjCK+KdFEfSgCiHzqKok6jE 1qRBcqztaqKmfBRXKW6c2vCfjbg2G0JTEXMlSHbbYUQJAs+CmScR5xQdGUSh2T8fVB Uyv3XEl2W9O2QNJ9TWwdm6aENBNQJTeczYB0GGj2fMacEeSDw+KD9eiN9uaN/POm/s jFIe3zspDGv0A== From: Mark Brown To: Liam Girdwood Subject: [PATCH 04/20] ASoC: sta32x: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:00 +0200 Message-Id: <20220602135316.3554400-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=858; h=from:subject; bh=jRLUgUntU2fruxLhA+W/LLYekTcTbLPo5lIlqi7/X/s=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCRzCX2Ws+l5zKiD5EchYFHv5T4guU9Wa7gxzP0 ECe5zJ6JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAkQAKCRAk1otyXVSH0AeBB/ 0fyiJKEcggu7tTU1FXTyAGTkan7/oFi6jiQZU4Kj+JorsMXMpoJQ7NZkiZziT9Xd2fB1judZSKiobL Yum8IgScOqQnMMgBSMC96P0RuQ0CmgmN3S/8YGJArMqNGSZRgc3z+tcamyjDdfpHEmOUB9RX7VU+/r DzC5H7dputF2/1a2FQzpOS4pCMuhBh3Mw2cWRRrYqxjYGVWZEpFzxBOyYK5KJRPFqeXBGYjC8S4rvV 5rnLDIENTbTMR/o/vUxkBLc4cyynttDH46Y4oDO6W6w+puLNCSHtU05uBy1xSAKj2Mwvk54R1XIxWf SqnSARuutRkfU6VM61CoSn1QUQZiCg 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 sta32x driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/sta32x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index 8585cbef4c9b..17e5077f26b0 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -601,8 +601,8 @@ static int sta32x_set_dai_fmt(struct snd_soc_dai *codec_dai, struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component); u8 confb = 0; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; From patchwork Thu Jun 2 13:53:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578200 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 8A8E4C43334 for ; Thu, 2 Jun 2022 13:56:22 +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 CFA9617B4; Thu, 2 Jun 2022 15:55:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CFA9617B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178180; bh=yzZe04MIihvNYYfonwNH+DTgIjUQiaeeFJhn6vPEwfM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=MmJ9whgAdBVu4bMSbk+hno7HwnpD3sJje9Cq+gosmUtqEAV7uGf7k3fHhyRydHDgP sY3VZcZuzN9l7bkzonf9+tBS4BLhWpZXP3t4IW0/E2D0f2dch5fI3AF8plYk1YdH89 2oNNLThSGOBVjRwbf3if330fCDEj5Tb4v2S2Pbqs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id D2338F80539; Thu, 2 Jun 2022 15:53:39 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8155BF8054A; Thu, 2 Jun 2022 15:53:37 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B937AF80089 for ; Thu, 2 Jun 2022 15:53:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B937AF80089 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Exvj4leC" 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 ams.source.kernel.org (Postfix) with ESMTPS id 84D50B81ED5; Thu, 2 Jun 2022 13:53:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89EACC3411D; Thu, 2 Jun 2022 13:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178008; bh=yzZe04MIihvNYYfonwNH+DTgIjUQiaeeFJhn6vPEwfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Exvj4leC+N8wVDPkO8ep/udFngOXbi1ZM9Rp9roCn8vY+V4VvYexugFALPCRy++FT SijK0rTVDzv435Sau0/1S/xfyLjTqm00ao4YCg413x5pppBG8OO2FcHG3CLeQD+snT qtJPnXSrxBmlkgNHKaCRViEaU6rSf3ccp0v4gTJfXSTxZNqZU+gmpjAZKgMvx2YNl6 JkCIyH7VtBMV7J2iRwHYT2csWXmovl0XQoxwc9hYlJNhFp6l7zBGIORmws4t3a3hCJ 2rFWp3SEDKA0w6usWDJr+8b5DP/cQn4rnw6wK076vHKiC2Yyp4dG/qyqE9dru2Idjw joYLhF3dzyttA== From: Mark Brown To: Liam Girdwood Subject: [PATCH 05/20] ASoC: sta350: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:01 +0200 Message-Id: <20220602135316.3554400-6-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=868; h=from:subject; bh=yzZe04MIihvNYYfonwNH+DTgIjUQiaeeFJhn6vPEwfM=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCSk/jP8KAcF7m9DB8USKYoXygsiWMjQgDV+sGv QPlUc32JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAkgAKCRAk1otyXVSH0Ev+B/ 45G558sNViQVa++cqkRWFvSPSr3HeQgt61H9zXj9eH2tG2SVccOTl8NRxWasi93qaiquJWXgpHYX/c +bKJbTr+VcwZGTwqfpR9gmnW3uo1B9k/Ox31xoxxl2Bi0QJKcegB9YQJ+PQI7B26+AF8c4N7QAbtR8 BkDqvSZw+9b9UEVBlRVdzHm35MNzBwwwHcuby2yu5KaaHDz5+L97lCiCk17syO0tShN5plsuNJILiC nJWrkQvBcx0x06VSbYaw4+IbUDeb19rXydFz6EK06tG2Ej/hifDq3eUmZVQeVng8GoNeRdQiwF0DWX J8SH6oRYGtZ3iAOBhGH5rZqdsvqft+ 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 sta350 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/sta350.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c index 9189fb3648f7..b2d15d20fe63 100644 --- a/sound/soc/codecs/sta350.c +++ b/sound/soc/codecs/sta350.c @@ -630,8 +630,8 @@ static int sta350_set_dai_fmt(struct snd_soc_dai *codec_dai, struct sta350_priv *sta350 = snd_soc_component_get_drvdata(component); unsigned int confb = 0; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; From patchwork Thu Jun 2 13:53:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578201 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 3CA2DC433EF for ; Thu, 2 Jun 2022 13:55:56 +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 73A8817AA; Thu, 2 Jun 2022 15:55:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 73A8817AA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178154; bh=Ri2UCYgxRMTklRg+xVI6zTk4ef+4/+SeBSaDiHxSok0=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=rSXBqH7Z7oElYliIp8KMq9zCjSBj4ZMcKMJYnHcCAm4GayhwvqczkT13Ane9tWato NPLPFT7VzBrHhnA3hu2jGo8/g/JY+cm0UryVMl7wWOhzGBEu6rFnuBuxHHsv+ro2LS UyJ9pPoy2h9WJoPVZiqmADZEpKwWkkjyP6UI9UCY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 978F4F8053E; Thu, 2 Jun 2022 15:53:34 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A17B0F80538; Thu, 2 Jun 2022 15:53:33 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 0DE5FF80089 for ; Thu, 2 Jun 2022 15:53:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0DE5FF80089 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Aa6jzAyu" 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 ams.source.kernel.org (Postfix) with ESMTPS id 96EDBB81ED6; Thu, 2 Jun 2022 13:53:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CCB5C3411F; Thu, 2 Jun 2022 13:53:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178009; bh=Ri2UCYgxRMTklRg+xVI6zTk4ef+4/+SeBSaDiHxSok0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Aa6jzAyuurtaZ6r9mZ2cajhyM9pZ7bCiCwFiFxYuzmdO1zSVPzwUIDeW00+uEAvGq lhTCmHIr7Na3XFf5DMrD3I9gAPmFC8J0KQu67j1aa3cwdBrEdKyLePI9mTyQT2Rjqb QjjWSKgjV4jOf6tPym1MnabcB7frG/5MYkN414+4ehOgOJjDr25WvFW6NoUTAO0Lkk C88rvt7Keq+kZKDkORq7vkqPIhwwY71h8BM2AyhNaCbrYkQp0VVGAhoF/NdUKLwt5g Qr55Pg9mQAbs0JKKCUTelmj76JXFimXMAhhO0spPYbcvbtsmLLUhUov4zWs8pn1Puj SRp1qhkFhdzAw== From: Mark Brown To: Liam Girdwood Subject: [PATCH 06/20] ASoC: sti-sas: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:02 +0200 Message-Id: <20220602135316.3554400-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1093; h=from:subject; bh=Ri2UCYgxRMTklRg+xVI6zTk4ef+4/+SeBSaDiHxSok0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCTOCckEoTaGdO/lysCFX3L6zBZxH3kC1DbGdTs urk25QyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAkwAKCRAk1otyXVSH0BDEB/ 43fcfz+gp9Kc5IN94SvBp4rDCEdMIADX8fY+fuJE1wYY7CJdR4C/o5iQ1j6iZhM4E/w5Eqosn1OAd6 ZNi/uKXhKE3HLVszs8xVKgi7w3LZXtNEcqy1Gnj2iaPOID8d9tZo2s4Md+8hCL89XLtsOgXFRiew37 CqvKJEewbZI7Emiz1zhGNdMOP20mv8ID7GjodLOVqC9wIB2rmWRvS+NoezRoTR9AE8qyFh3zZEXj3l u5zcdruy9MKBUjQlbBjModP42DX8yQIqwCbmAupNS2t7+O2tm64esyyeh4ORVZHgmpz3bsejR/he6r yb3HzrWVRQTN9mjaQ5BK/LXcuADehQ 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 sti-sas driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/sti-sas.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sti-sas.c b/sound/soc/codecs/sti-sas.c index 3be4940e3c77..10a6a112f4b4 100644 --- a/sound/soc/codecs/sti-sas.c +++ b/sound/soc/codecs/sti-sas.c @@ -199,10 +199,10 @@ static int stih407_sas_dac_mute(struct snd_soc_dai *dai, int mute, int stream) static int sti_sas_spdif_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { + if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC) { dev_err(dai->component->dev, - "%s: ERROR: Unsupporter master mask 0x%x\n", - __func__, fmt & SND_SOC_DAIFMT_MASTER_MASK); + "%s: ERROR: Unsupported clocking mask 0x%x\n", + __func__, fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK); return -EINVAL; } From patchwork Thu Jun 2 13:53:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578515 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 658CEC43334 for ; Thu, 2 Jun 2022 13:57:14 +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 B2B2C17A8; Thu, 2 Jun 2022 15:56:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B2B2C17A8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178232; bh=UV4KLVXEt3csZ4I0hhI3jLBRmZFWgvdIqhB74FxI2ts=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=KMPgvqfgAB2qASHIIfF7EBqtoPXW8Kn5bWzqefYpJOYPRPFYsFDbmG9BVI/M8h64x exD1K8mP1t9azsXqJjeRqlf1miaKiqBWWVkFLofOtUNlbcwGXkVYHskRmyESqsSqU9 /DEkxR3N5+Vu62Ew5PrMId6WyVq+0m8aH3p+jl1A= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 65659F8057A; Thu, 2 Jun 2022 15:53:44 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 37EC3F8055A; Thu, 2 Jun 2022 15:53:40 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E52CEF80542 for ; Thu, 2 Jun 2022 15:53:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E52CEF80542 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s4It3ktf" 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 99872617C8; Thu, 2 Jun 2022 13:53:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B099FC3411E; Thu, 2 Jun 2022 13:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178010; bh=UV4KLVXEt3csZ4I0hhI3jLBRmZFWgvdIqhB74FxI2ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4It3ktfFAV5+JQc+gVat2lQNMIfPd8Mh2kwi1tBkCE9Xmcpz7zdoxZnBT1QXBt6C rR7RrsT3s9zT0ESS4pKbIzopeLT3P08uiIt071N5/oWUXyfsKU7rIFJtS3uzdESQdj /iJGNNP0ewtD/fhxbqtNzeiegp6hSYK2g//x33QX+ImGk6eeDm8bXMhrYnZtUB8CPB wRgFvS6/KJvSfD7i8ScI9SMW8RYTRIKEsiH62kYUKvx/5uZRyHjdCL5RTvVUEYwQJO 14Nhwog47BiB8CWnvUH44Ev6Fshtnf7yUjfZ0Dm3dN7NlrM/qUSCQASsz/Vc23Lq6I u2xy395JcXcgw== From: Mark Brown To: Liam Girdwood Subject: [PATCH 07/20] ASoC: tas2552: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:03 +0200 Message-Id: <20220602135316.3554400-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1245; h=from:subject; bh=UV4KLVXEt3csZ4I0hhI3jLBRmZFWgvdIqhB74FxI2ts=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCTUz5Ds4tI7A5V1us79mT1aCreuzPKcaPPAPOn b9IMtQOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAkwAKCRAk1otyXVSH0CjYB/ 4/zTUANI+EdJlybmejVvHo72wnhsklMVvYeYvcMakdV4HHX3H8K2C5NJTXUDMKiZwp+qd2clHgEJVq n6u99pePWV7iNx3kiRkH4nPemCVU6QoXR4wSqetHXm5DHMpI28CFkdu3p3zQNIvVcZi++p3encruJw g6GYEAQxcTJC0ufRFos27XQbbh96j94P6eS2q4lXzkzuYnidD5HJzj5gbt5jKtMs8SIhl/58DV9xxo 2rIYfvYsFF733uJoX7eS6Wa9fxDu8uZXfZ9oA3S9TYbapm3y+frBFJUuNlYh+vEq3qN+If7RhNznMB pFCtwhvIGoxfpvC5QNz5E7XhBYpV2r 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 tas2552 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tas2552.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tas2552.c b/sound/soc/codecs/tas2552.c index b5c9c61ff5a8..c98a9332dcc0 100644 --- a/sound/soc/codecs/tas2552.c +++ b/sound/soc/codecs/tas2552.c @@ -347,17 +347,17 @@ static int tas2552_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) struct tas2552_data *tas2552 = dev_get_drvdata(component->dev); u8 serial_format; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: serial_format = 0x00; break; - case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBC_CFP: serial_format = TAS2552_WCLKDIR; break; - case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBP_CFC: serial_format = TAS2552_BCLKDIR; break; - case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBP_CFP: serial_format = (TAS2552_BCLKDIR | TAS2552_WCLKDIR); break; default: From patchwork Thu Jun 2 13:53:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578517 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 F2980C433EF for ; Thu, 2 Jun 2022 13:56:07 +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 3A9E3179F; Thu, 2 Jun 2022 15:55:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3A9E3179F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178166; bh=qcrPqk3+45ISAc5HSWjLgTQRi8UwFHLUSM3O578HDgY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=F7qK9hynoVRmeAdRl3bSMyPGTEy5iutXT2x0XB5OI6s+c17oXnOms3Yr8QAaC4G09 gPnn/Ysu4MMLOOegbJiIuL3Fqlsq1lqWa8BABMPxJ7J5C2AIkPvWza7tBrRXDBpNCh iLJiyZksPUbX6UzKGIzylCeQN+0CTZ2WbJ2K28Ec= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A6364F80549; Thu, 2 Jun 2022 15:53:38 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3D29FF80544; Thu, 2 Jun 2022 15:53:36 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 57F04F80539 for ; Thu, 2 Jun 2022 15:53:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 57F04F80539 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O4yV31sk" 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 AC269617CF; Thu, 2 Jun 2022 13:53:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8AC2C34119; Thu, 2 Jun 2022 13:53:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178011; bh=qcrPqk3+45ISAc5HSWjLgTQRi8UwFHLUSM3O578HDgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O4yV31skyKOi9DKVGIttMWLXWuNL0cnQkRiPbDLLd2lnKf8E1JGNlYn44PvMNMsuB cSIpo5epicFdgCM5yz/MYNvrA2gTuLvB1ROiQaA9gYl0G6VZNP01KbdjNhyEmnl5aE 35BfLjH/0ptJFwr2bb8Zpjyk/i/pIy1YWOwJyyyC6WzvN6VOmvqPY99lBxnfpI4GTr 1ZPLxyZUrdGar/9y8RGyEHnU1M/mPOdIiajbs4y5NKPY2zpSHTgtwGd0qaDTjeiWoL 9KsWVj0CTlMZ/HT+r8bG9kr0cb+ltqSAIw7sZIDw7yva9n/Nj3aP4JKTjms3JNjTHV EKsh70S9VXR7A== From: Mark Brown To: Liam Girdwood Subject: [PATCH 08/20] ASoC: tas2770: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:04 +0200 Message-Id: <20220602135316.3554400-9-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=970; h=from:subject; bh=qcrPqk3+45ISAc5HSWjLgTQRi8UwFHLUSM3O578HDgY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCU63B688Jiv1CtXMhAMkzG5AuX1aWVTRnq1NkI 3UzMldeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAlAAKCRAk1otyXVSH0Mk1B/ 49WsNBZIEcs8WoQTQ4T/Doer5o0wl0vLmbwqZ2Nsz0fBZVSqgwF79831XPFCAnMfeEda+94ACdEMl3 xslGXGw7nrp/Xzz08z3MlkUkboRHCWyWPdxgJkbADXG6ObCELv2j+eBGR/A3pMwYAvrTEOSCM3+UrB EEooMPx473RCfz1OXIVlop7/SEQHx2l/49Fk66zqp73nWfFYB6VHdl/q1069QsyU1WxCmMyO0UBXIQ aAvIkpHRNIt4ykONt3LIqnw+86TgYASOGYpelM1j6ndzSRaD/wYBRco6iM6kctwVM7sBT/Z/Wx990F jWg2XfgM+ius+N5ph2Hdq6mr87ccHL 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 tas2770 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tas2770.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c index c1dbd978d550..f6037a148cb6 100644 --- a/sound/soc/codecs/tas2770.c +++ b/sound/soc/codecs/tas2770.c @@ -340,11 +340,11 @@ static int tas2770_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) u8 tdm_rx_start_slot = 0, asi_cfg_1 = 0; int ret; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: - dev_err(tas2770->dev, "ASI format master is not found\n"); + dev_err(tas2770->dev, "ASI invalid DAI clocking\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578199 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 E6A41C433EF for ; Thu, 2 Jun 2022 13:57:02 +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 27D2F17DD; Thu, 2 Jun 2022 15:56:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 27D2F17DD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178221; bh=8mtQAJrIEjtHGBDCgoCCiRJJcw6/xBU7GFilFnU4ESQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=AIUZtMk0AFWm//S4jTv7d76h27nEZef0lmMvgwDcfkAewBva8L+qV6ZaDyMqUNvvG ucTl0X7OG/ELIFtYEUoKFlBFwepYGbAfKWwcN1Ams7m/5XT5evFlYssEfhRrPjpzZM 1T3m9f+lnXCLjwRrkRlyhQhhrrSq1jash566t/Qo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 33E66F80570; Thu, 2 Jun 2022 15:53:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7C5C6F80553; Thu, 2 Jun 2022 15:53:39 +0200 (CEST) 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 B926CF80539 for ; Thu, 2 Jun 2022 15:53:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B926CF80539 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N5PYZx5u" 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 2D887617D7; Thu, 2 Jun 2022 13:53:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC13DC385A5; Thu, 2 Jun 2022 13:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178012; bh=8mtQAJrIEjtHGBDCgoCCiRJJcw6/xBU7GFilFnU4ESQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N5PYZx5uIm1MEJpBUnEeP7WGh+XDheBVjEKChddgDQOIQDXUrqDTTTO+YvOCHu1SF vjai/mno3PQhCpUozISk/6MtZPhRjA1lJHvArM4ZYRUhxdf/XGjqVBFVZFupFWEpSj Il0NgKv1ehehEjwjJI5uYCjL5q1xUJ0Ua1j2o6hC9Oc14+RHv3O3cobmBn44vveX+r JeyeVHiKQMN3nNdROhEvQXPvUN0Itl5PrMgMOFQbjxpktQVE40eIZ8AdbO1ykBXgk3 51e95diYwLbtY3kwRPA3qDmFdq4C9ethQi1aneSaXysYQhaQhOEe2Sx0Hdf6WJTQBD HUA79poVqOZqw== From: Mark Brown To: Liam Girdwood Subject: [PATCH 09/20] ASoC: tas5086: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:05 +0200 Message-Id: <20220602135316.3554400-10-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=927; h=from:subject; bh=8mtQAJrIEjtHGBDCgoCCiRJJcw6/xBU7GFilFnU4ESQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCVKKvgw2zxc59AqTTeO+6U52K3aDXnEyFgBQSc 4vRJbCyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAlQAKCRAk1otyXVSH0Jz9B/ 9Nv66oIPbEhjBFOrQZgFt8m6URL2hSWYZqiO3LzesmhyE4p0UjR7QiKD1CrpQLhf6UENsPM0/N5ey1 0AFH+XZHXuG2LYCNNkPNbviG6fB490JWPsVdhJGuiHZgVA/k/67+wt5twIIC5wNsiT+mP139m3SRJd /cljTbC6vI+8M846siW5rpLJRqkW8wZJi9KNuSayhdy261p7+kPFOqyrk/H0qp7/FVVR0bhqnKk7Lb KouTmlMIb9TKSLE4cp0gn7XaUwk/BjC6jiK0tdHGv2N5LNHzN2uNsibyubEKYOcSMsccY+wmxvfEUJ VAQshEN+1WcegSGCTjmTf4flVGZk8W 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 tas5086 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tas5086.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c index 5c0df3cd4832..05b57bb1aea0 100644 --- a/sound/soc/codecs/tas5086.c +++ b/sound/soc/codecs/tas5086.c @@ -318,7 +318,7 @@ static int tas5086_set_dai_fmt(struct snd_soc_dai *codec_dai, struct tas5086_private *priv = snd_soc_component_get_drvdata(component); /* The TAS5086 can only be slave to all clocks */ - if ((format & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { + if ((format & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC) { dev_err(component->dev, "Invalid clocking mode\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578516 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 B3BDFC43334 for ; Thu, 2 Jun 2022 13:56: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 09E0217DB; Thu, 2 Jun 2022 15:55:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 09E0217DB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178199; bh=HSjYW/Ue569WZ3BuYB2cymAs33fXhPkQX6QyYPRA2nc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=uEw78ZeBlF9HXL6J+BKi9rmVRJrTxAl6kwDdBequrINTYH17tfp6oUHU+JXlBg/71 sl9rUEv/QX+DwHt8Y+8e47GCLwsTQF3DGPdzZB8EK2/GIUdVlu4cRkQdtUlj4FmVfp Non6p7DiqNrvopaTVOCfcOIUutzwSCyl6WK6C1iQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id F22E9F80542; Thu, 2 Jun 2022 15:53:40 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 91FE7F80548; Thu, 2 Jun 2022 15:53:37 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 93D0EF80542 for ; Thu, 2 Jun 2022 15:53:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 93D0EF80542 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mxqPna7T" 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 ams.source.kernel.org (Postfix) with ESMTPS id 0049AB81ED6; Thu, 2 Jun 2022 13:53:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F01ADC34119; Thu, 2 Jun 2022 13:53:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178013; bh=HSjYW/Ue569WZ3BuYB2cymAs33fXhPkQX6QyYPRA2nc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mxqPna7Tk+OWBmVTip1ZboSRJmT8tz+CisPboc2h3tep4CsrfW36vceYwd24uwzRI lhosDe/5dheBcbby5KvxjYx7SzHdpiI1ey9hbhc4Ru4d1h3OIDfr9/KZWGFEC9+8gd 0R//KW0yFgGnT+XkUqldl3RfbQKAkybDdLUphbIIa/Jol3MmjLWxXXLQvqSqXC8VII lzsEnXzvevgSHOcoit+V6lHlSZWRR+ETcryFf7+jO21KBiDgHejSunTuAWOFDyj1ES o5YqYrLH8HqAjVF8WfMeth3f+KJ5llUPCe1Q5PwAiJ2gWU8Gz96F2cY52ZvYEyNPo+ 4U8Z3iQtkrplQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 10/20] ASoC: tas5720: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:06 +0200 Message-Id: <20220602135316.3554400-11-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=908; h=from:subject; bh=HSjYW/Ue569WZ3BuYB2cymAs33fXhPkQX6QyYPRA2nc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCWL3aatMLfzNHABfhVrKY4Hy6BtQPG2SgyZ6+9 aelBKT+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAlgAKCRAk1otyXVSH0M+gB/ 4v4VuAmbKpNOaI78oBnovSzDjcKxyqhovjCki08rdNgFJo9c/rcCfsR27fEOuBMHHAWXIZRzQyA0rR uawuG2zwNH32t9G+KHd7DaQRx/nS6Rh89+1NwtxVgjuM/RYgYF04kh2dpQ2mX7jABoT9oDVrfxP0vH iIlCay6joNcJbKt9ZwUB8BTmcslsQpPh+TCXi3fuIqkHk2nI+e+M/zTssZ7Ald28ExaubAlKdv9+Ld Jf+p7R4yaQJeo6Y9Y2snwpNCRt+tnLNt7ki+icvJrBhEz4Z+33qFXiYl65jYLB5U2Zxdc65IjCFLI/ PPg+OPNj66Q/aN9C/MIEO3Z8eKe+Lf 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 tas5720 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tas5720.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tas5720.c b/sound/soc/codecs/tas5720.c index 17034abef568..2ee06a95f3e4 100644 --- a/sound/soc/codecs/tas5720.c +++ b/sound/soc/codecs/tas5720.c @@ -89,8 +89,8 @@ static int tas5720_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) u8 serial_format; int ret; - if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) != SND_SOC_DAIFMT_CBS_CFS) { - dev_vdbg(component->dev, "DAI Format master is not found\n"); + if ((fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) != SND_SOC_DAIFMT_CBC_CFC) { + dev_vdbg(component->dev, "DAI clocking invalid\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578514 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 95CEEC433EF for ; Thu, 2 Jun 2022 13:57:51 +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 C1F71177C; Thu, 2 Jun 2022 15:56:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C1F71177C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178269; bh=4e6ZMjbNEdis1JPP1p3H7X7kke/Fq3tuMk9rPmksANg=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cf+CA7O5iAQl8UXuaXk0A+/wCneJolQySGhrDnUk5T1s2w/UtJlbjYdecZBPyeSAV 8gZgd7cK1PbAHHBBbfBOFuCmKxyZW0LAws/y8PZUN8Ku6P/LV9usaeGy5iUgnoi3jx Sguu4j0mVuqRjFKk6FH23RDCk9d4aStkZs74rNyc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7F672F8058C; Thu, 2 Jun 2022 15:53:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0E5A1F8056F; Thu, 2 Jun 2022 15:53:42 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AD9D8F80544 for ; Thu, 2 Jun 2022 15:53:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AD9D8F80544 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="D7mjKzhu" 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 ams.source.kernel.org (Postfix) with ESMTPS id 13BC8B81ED5; Thu, 2 Jun 2022 13:53:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F73BC3411D; Thu, 2 Jun 2022 13:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178014; bh=4e6ZMjbNEdis1JPP1p3H7X7kke/Fq3tuMk9rPmksANg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7mjKzhusiT4yoQU0esfTSbYJw5sqc37zJVi1JRVc8dQUkmRjaYjwDkQr4nFpEURH 8Oepfbxx/QMJHapxsJQ2ejX3iFUzUTVTGQ2AaXCNl9fZ00s5w9xRp+/GWhJYBc5iST t10gFp6o3I0ynQvr1Sr3Rsn+KIQJXdi4y+VeGAZOhvzPhWldQ8KoPJs6wAC8itSrQj ZhMckmnbINh+s+cWxZc9w2UohiV8wAMOlQ3pFUYykNgxSpJIoTax7sIo/dBsLpANP4 SUkrHvn8ICdUVRPd18tdOa4wQi3hwrN9t11+x/Spll57W4mwJ7V1aINJnP9Wb98CPW Ya8PtYTE7opCg== From: Mark Brown To: Liam Girdwood Subject: [PATCH 11/20] ASoC: tas6424: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:07 +0200 Message-Id: <20220602135316.3554400-12-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1008; h=from:subject; bh=4e6ZMjbNEdis1JPP1p3H7X7kke/Fq3tuMk9rPmksANg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCW3W9oBcBn9kFflsx5icQMv6D9vl6fGxu/7vZf 6Ul1YLmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAlgAKCRAk1otyXVSH0MzxB/ 46zRJcMO9SAl6ft/Bc7SZRHEUUHZpg85Y2VvxkiWe5lZ07LOS2qvcAM2H1j402jtmnTvShohhOdszC t/pb9Le36p5RcszVcYFyipm9AsleVBdJwMDhr4E/6uAjFBRxUto/VwgwXDK/XG7vYhp72d6TmIcIK9 xRid5Aqyh7LmjvZDb6xVV0ZYvthnZF8BTIsohsx6er1+WJKneZptE6a8JtKufMBXRuWb08qXpJX8FZ 4hLlsI9T/+7DlHloX3SNn/An29iLU11s/7lAJW5BP7bbH+M1shD2u3MOKQECXWVA2c+V2uvEPCO7wB 3GsONFVjXUVj+gC66DCF4MQc/FvBSh 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 tas6424 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tas6424.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/tas6424.c b/sound/soc/codecs/tas6424.c index 22b53856e691..9c9a6ec4d977 100644 --- a/sound/soc/codecs/tas6424.c +++ b/sound/soc/codecs/tas6424.c @@ -160,11 +160,11 @@ static int tas6424_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) dev_dbg(component->dev, "%s() fmt=0x%0x\n", __func__, fmt); /* clock masters */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: break; default: - dev_err(component->dev, "Invalid DAI master/slave interface\n"); + dev_err(component->dev, "Invalid DAI clocking\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578198 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 A8F58C433EF for ; Thu, 2 Jun 2022 13:57:32 +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 E8B821774; Thu, 2 Jun 2022 15:56:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E8B821774 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178251; bh=slnjXFuQx2CxmCeXUAaXzm782cOCmjgTLMmaLTkUwYM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kVJnyWEa6wYDGPbpCyBXWWvP+xlKJXF2oM5V1jwsx0WCeHGAtspEMOCdd4SRQcbmh SMY1cght5ZViG7poGPL1OFo5VQDuIkp5k26HvF6qp9MvLnctNYT9a+lutrLlh1SzXP 9uK2M8fCDPnGOFn50bZuXpBk8urf/+h4BG30FJpw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id AD43BF8057D; Thu, 2 Jun 2022 15:53:45 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A963EF80566; Thu, 2 Jun 2022 15:53:41 +0200 (CEST) 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 CBD3BF80551 for ; Thu, 2 Jun 2022 15:53:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CBD3BF80551 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pWd9dWn3" 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 6736E617D6; Thu, 2 Jun 2022 13:53:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2288BC385A5; Thu, 2 Jun 2022 13:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178015; bh=slnjXFuQx2CxmCeXUAaXzm782cOCmjgTLMmaLTkUwYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pWd9dWn30mtzJg0sydIPAW0HQ3O2aTvtH57NuRJe+qmKVeqIrJnAQGIsafHLl4lSY w4UFoV8IrwIVKQusMiuRkB4QVm+kJLcyPBVJLMjpcxENpbis4LC1KO0/jVumKxTE60 TehH8sG8sfY2y2dbm+zpugmpeG9Fsk6nthz52gvQ+z/Z4UIv33mW2KBbS2TG2MY6aO MAw2nFGnv6qm4TSRBdmwi4RvVEINm+71vFB2EYXJ07JRzmm0U+iy6c7Ur0LirMrU/B ndqMxaYJpOQcLNXT9UvmZdNXMSCldNIXd2IfmUQgsGmvrSKZ5oNXo0hCsCvixNIKTr lOusAi7LQV4hg== From: Mark Brown To: Liam Girdwood Subject: [PATCH 12/20] ASoC: uda1334: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:08 +0200 Message-Id: <20220602135316.3554400-13-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=880; h=from:subject; bh=slnjXFuQx2CxmCeXUAaXzm782cOCmjgTLMmaLTkUwYM=; b=owGbwMvMwMWocq27KDak/QLjabUkhqQZB6YH6q8t+d++ObPwfdZ0uWvzdRhzChzbuE85F51d4SZ/ RHN5J6MxCwMjF4OsmCLL2mcZq9LDJbbOfzT/FcwgViaQKQxcnAIwkRBr9n/WrXaTWywCuY089I+LKx 7+wZ/JpS7VvnxK0PSn/Z9sriyS0sj3df8puV98orbrjmT/2+xFUUfkrkgncF4KEZm+10Gy51O/zK6J sl7eaf0+fMtdeJU9tV/eWJgz2dbJ+qGjYmuu2x8uNWFrwzMVmxY90JH52mjIY/i/dfekGad8nbUOv8 tz5djP32ii77ehuGaeq7XPQ5cvi5eWyYk+aLSvkXI4MeXUFjNdxdOpx+SE/wr35q/XC5+50yX14g89 2d+yeTwbXRKzAw/c0Pgfan1Y5LPoDuN5B3j7o39fF3xxvSBqdVvqP6kef4e03Ebr51YmZ27s2LTvyq UlrEuZL6+fE3fctdst9NFk0+/SAA== 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 uda1334 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/uda1334.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/uda1334.c b/sound/soc/codecs/uda1334.c index 8670a2a05a56..9d5ed34e5420 100644 --- a/sound/soc/codecs/uda1334.c +++ b/sound/soc/codecs/uda1334.c @@ -169,7 +169,7 @@ static int uda1334_set_dai_sysclk(struct snd_soc_dai *codec_dai, static int uda1334_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { fmt &= (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK | - SND_SOC_DAIFMT_MASTER_MASK); + SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK); if (fmt != (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBC_CFC)) { From patchwork Thu Jun 2 13:53:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578197 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 95E5DC433EF for ; Thu, 2 Jun 2022 13:58:02 +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 110F917D3; Thu, 2 Jun 2022 15:57:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 110F917D3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178281; bh=NeDYffPh1grI/6GxifzALRBVAir/zapwQauikcKJtp0=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=djhOVtotwACkBuxfLPjtL37lWsR96zleNp09t5ZVJCpnjJ0P2UUGlFt87Fe4WrM37 YPIdkGIYh6R8zZ59R979FmUj0FheBAE0s4jDGgo1GLMsqfIbHipqo/syGQjT5AbP5b s/6KbhFGr2WlTXQQd1WskeMs6QCQdc0rNnub5nqE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2B5CAF805A1; Thu, 2 Jun 2022 15:53:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 76965F8056F; Thu, 2 Jun 2022 15:53:42 +0200 (CEST) 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 0B4F4F80558 for ; Thu, 2 Jun 2022 15:53:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 0B4F4F80558 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sg1s6+uL" 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 80A86617CF; Thu, 2 Jun 2022 13:53:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3703FC3411A; Thu, 2 Jun 2022 13:53:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178016; bh=NeDYffPh1grI/6GxifzALRBVAir/zapwQauikcKJtp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sg1s6+uL3QxKYafWeXClbIFYXxM4NnPjyop2n2TLlzVZzfGtxwBnTec3yf0IZS5Ys D7JysXO0Qa4C3wMeC4p3GR0RrwWL3wg2knoTrs5bMsI+a8h0gItsya45Sj7xk1t6WX pItzEjV+aownmO0qSRWfpYBKeLJ1oQaX3Mv52iF5iLIf6sgWrF2s1N1Lg6/rOIhjFi W4SKtKz8VEOovLJW2l80I3sZIRFmjw6z5cBROs2jP2h1ydwNKmCVHNYlhMWuUHyVvp zZXq2GIU5FipWDXjyp3+lmzdZkmEwtqZo++fPakC6bk1Xb30NdzrdDeLjFRHVYeewN tCG+UtfEXeT1w== From: Mark Brown To: Liam Girdwood Subject: [PATCH 13/20] ASoC: tlv320adc3xxx: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:09 +0200 Message-Id: <20220602135316.3554400-14-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=898; h=from:subject; bh=NeDYffPh1grI/6GxifzALRBVAir/zapwQauikcKJtp0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCYAZ6ethlwl9fJSNdo2ntdXIFOBUxFQJzm+4GM 6FX8rWiJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAmAAKCRAk1otyXVSH0ER5B/ 9pr4Heer+JYNUXfLtygJynyM9gqYH4OmONDKFUIzKZbtugugH2NX9kIHkVvw+5BFmOGW3gvmjD5R+p PC/nVgF4W1/JL/UeGKV+2oLvduOkZttUw+SwSpt0LNkPIlSe8lbig2L3KXjgSigUYDMpRXvsbPxXyI 0Mmlj6Xk0iv+trYDc3ubvLE6x5SrZd8aFKxbdpI2SP6fZERK6E0/CS0umNXqpOF4OjXjHR6IZH9yyF Tz3WXjUB4TxWDCkMw6pydLsTq3b6oMJwg0Cp7MT/J10Gcqmevmf0oR6YXzIEZ8/hg6NPfOrKY4EDwx 8lSeBBsBlt2sMImDe4ZR8h1+o8+ATd 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 tlv320aic3xxx driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320adc3xxx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320adc3xxx.c b/sound/soc/codecs/tlv320adc3xxx.c index 9176885bfc39..ab2c613ac0a0 100644 --- a/sound/soc/codecs/tlv320adc3xxx.c +++ b/sound/soc/codecs/tlv320adc3xxx.c @@ -1255,8 +1255,7 @@ static int adc3xxx_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) int master = 0; int ret; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { case SND_SOC_DAIFMT_CBP_CFP: master = 1; clkdir = ADC3XXX_BCLK_MASTER | ADC3XXX_WCLK_MASTER; From patchwork Thu Jun 2 13:53:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578513 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 7CF81C433EF for ; Thu, 2 Jun 2022 13:58:17 +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 9E65F17CC; Thu, 2 Jun 2022 15:57:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9E65F17CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178295; bh=/hAIygZ9pnkY5BaakFen8njV1tYUtUcli6+CICPFStA=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=FMInYXvtPBhn8/ZrbwkncDGdwuk3Ut9qTwuDITQMc/CYBXJW/qHhERAafimSL3DQp PGRKjBsTeIuUWmgUVQ8+Z2mWwnnI/mqBXjiAqbqf1yxIBwJfPEnN2mqEr6CZtJaMOa LZAhs7HCAHtnrveQdDmtSMGvtTNV5Zw5995w2Ia8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A5C4CF805AB; Thu, 2 Jun 2022 15:53:47 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 400A3F8057B; Thu, 2 Jun 2022 15:53:44 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 54AA3F8055C for ; Thu, 2 Jun 2022 15:53:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 54AA3F8055C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dDhOIZc/" 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 8E601617C2; Thu, 2 Jun 2022 13:53:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AD16C34119; Thu, 2 Jun 2022 13:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178018; bh=/hAIygZ9pnkY5BaakFen8njV1tYUtUcli6+CICPFStA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dDhOIZc/fEBkwiMl5SYcEcQto1XoXJ38BdgTb1GA219qZlLzRPpZNPZhPbtk2NfvZ Y+ARy2mMeWk54t0CA7EEgYADxj8gmKGwneh06HfjrgvWMWBA85v2XvD0IqfNPYnBvM hJPmRvNcmy3ffnsUQS0TsWYExe0INCrG9ueI8NZWAqIJFAP/grkPLpQgwARDvx+8Yt kMvSIjdfEo5jZABWZsdMNbYYDPC3g90xJYoHrpZe3Ky79P+G7rGAV6cIwDN+l9v2lf YBavhyZxygJukLJuIUFEWpZHi509qyyVLHePVJcLCo9bIsZQmVZGWS8zZBihlebztH RS9SmrgE8RTIQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 14/20] ASoC: tlv320adcx140: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:10 +0200 Message-Id: <20220602135316.3554400-15-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1214; h=from:subject; bh=/hAIygZ9pnkY5BaakFen8njV1tYUtUcli6+CICPFStA=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCZK5X3HpB45fnqGedG4HE0s6HAAZO031iw2s4C 6Q26sliJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAmQAKCRAk1otyXVSH0E6rCA CAcT/u8Kj47kyxiBcwPnV9G9uXQQgs0lFMrm2ePxg4rcguKHygnoaZBLPn9YT7PV2gcktgqciRsxal sw2ly24jmXxuO4MiVszjbMu0GZByT/AOh+SXqyYI6/nmkIzTaboRlruI9yME9jmu32s4VYtRzRXPiu MAZ83qGbin1wPHvnJ6bnz8n0IbViqm4hh50FaSJu1UmCGdXyffOkrMcidrwgv0iocLRpCB5RK9mtJ1 PpPy24Q7t+0FkBYOH7NKBuPbAvGC6eLuriwyLC4cQyvTpEFd0uAhEBUSgFgjEpd4ZOtKFVz0IoLZAv hMU1U8fPpLMAtMb4YmDYPdmj0jZrd2 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 tlv320adcx140 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320adcx140.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c index b55f0b836932..de5b184a701e 100644 --- a/sound/soc/codecs/tlv320adcx140.c +++ b/sound/soc/codecs/tlv320adcx140.c @@ -713,16 +713,14 @@ static int adcx140_set_dai_fmt(struct snd_soc_dai *codec_dai, bool inverted_bclk = false; /* 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: iface_reg2 |= ADCX140_BCLK_FSYNC_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: - dev_err(component->dev, "Invalid DAI master/slave interface\n"); + dev_err(component->dev, "Invalid DAI clock provider\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578196 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 4FCA5C433EF for ; Thu, 2 Jun 2022 13:58:33 +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 7BBA617EE; Thu, 2 Jun 2022 15:57:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7BBA617EE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178311; bh=w26GDr/I+IdfLueq+CV/vjxvXeVOWHryrtibdOth3S4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mNOH26sPGn1cCje/RRDL5N7diaSfvglLs0mcPN7v3oaZ4tgJ+hFLIRCZ+mIYTTyQE uPgdQ4hlmEtwU/j6hUAZhrvqI9wVHTzXgNp/0pBdMUFtfWOYk9Az6PsT4nexRHIHw0 mTEuKCVhPmwN1Tyur4dO8L0RBu8jiG52Kaq1+xFc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 6CD57F805B1; Thu, 2 Jun 2022 15:53:48 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1A799F8057D; Thu, 2 Jun 2022 15:53:45 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C416DF80563 for ; Thu, 2 Jun 2022 15:53:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C416DF80563 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dD0J3I6I" 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 ams.source.kernel.org (Postfix) with ESMTPS id 56D70B81F5B; Thu, 2 Jun 2022 13:53:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EDC6C3411D; Thu, 2 Jun 2022 13:53:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178019; bh=w26GDr/I+IdfLueq+CV/vjxvXeVOWHryrtibdOth3S4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dD0J3I6IxiDRcQFfwV3jxEsC/ihvNznNttADNg31wv7POHM3qBK3WeUfiXDZIkg+y ysYAt9VTWVSruyivZxp2yJpvyeuRBvT5XBg9R38MRwVADQ+C3op0GJ7E4AT417uNAY lQ+ouAcSbsqs7TAN0rIPF/8jR4Z65kIQE95HBrGympYQLmMGWJmgfuW/ZbUCXpVuxI 4MO/GNMZ20e0TNgS/gAO9f3XmpLxrnQna1Y/6w7rfJwNb/kn4QYl+mij97dxo4MrAJ glKTQZaAU4Q7jLnATDQG0UUezXYFblMPgmG+fWTMjXOAiriWaQTQyKaQW0J/Glaxpx 52WfYkOmCrRIg== From: Mark Brown To: Liam Girdwood Subject: [PATCH 15/20] ASoC: tlv320aic23: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:11 +0200 Message-Id: <20220602135316.3554400-16-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1070; h=from:subject; bh=w26GDr/I+IdfLueq+CV/vjxvXeVOWHryrtibdOth3S4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCaQoriQccfch/8J29dqi8qMe4zIKOH7xfVhr/K GFlc5KGJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAmgAKCRAk1otyXVSH0BEYB/ 41+L5ra4v+dlnh+dQ5K3qJSNpeZDsxlvgi+q8RQKMInp6iIjOCL+DLELKn/WKORIWgvlxLgB7I8PHd eBpM4TtTZDOcWX+WI5vlGONjhVnWawRbbQ10LfqJ0DKp10C5ZMBezetPptsa/yOgO6GEjXWTsYHIZI XvTmTRUEP+8xj/WZA8esOuaAV2LgEyQ7OLwP2iL47g/vKMbVgNHRB7AfNcrcMYLw1TvLg3kV9bsxnV jWiGC05f3bQ01TcYozmVvsj+lthKWdCxGAmAj5BKp79/7cOv+8or2MkbM3FCV/M5yoYFvZXDlwdkSG gdajUBwt14utiNSm4l4dC037YLzsZz 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 tlv320aic23 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown Reported-by: kernel test robot --- sound/soc/codecs/tlv320aic23.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c index 2400093e2c99..f0d1c470fbf4 100644 --- a/sound/soc/codecs/tlv320aic23.c +++ b/sound/soc/codecs/tlv320aic23.c @@ -429,12 +429,11 @@ static int tlv320aic23_set_dai_fmt(struct snd_soc_dai *codec_dai, iface_reg = snd_soc_component_read(component, TLV320AIC23_DIGT_FMT) & (~0x03); - /* 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: iface_reg |= TLV320AIC23_MS_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: iface_reg &= ~TLV320AIC23_MS_MASTER; break; default: From patchwork Thu Jun 2 13:53:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578512 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 4E952C43334 for ; Thu, 2 Jun 2022 13:58:48 +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 9A58C176B; Thu, 2 Jun 2022 15:57:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9A58C176B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178326; bh=WiEB+pSwz1R54EZdCeRTRN3malm2U97zeS+286opCE8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NJBUKVVHhXsZnf50qaI+68x2TXmfO1Fpmq9idhm0QGgpr2GoMWO7N7jMeyUbS7kfe LZ2y0IbYd7ThaRiyXjBs5ig5b0m2QiX3BI1ApkDRFjwi7/cpraBH6nC5C7k1EZbDfW LG3YOWHUEOh+qFtZlmLBO0K1ltD6YrX9F5tFSV14= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8B45EF805BA; Thu, 2 Jun 2022 15:53:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 64385F80587; Thu, 2 Jun 2022 15:53:45 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2122BF8056F for ; Thu, 2 Jun 2022 15:53:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2122BF8056F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LAFfaTG2" 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 ams.source.kernel.org (Postfix) with ESMTPS id 69E8BB81ED5; Thu, 2 Jun 2022 13:53:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72A51C3411E; Thu, 2 Jun 2022 13:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178020; bh=WiEB+pSwz1R54EZdCeRTRN3malm2U97zeS+286opCE8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LAFfaTG2t7gGvFiRfXwuxgwyJXfYblP2Kgd3FARKnchmWZmYaNMCg9ovJ7kDuJx8k z8BCuQmvJc8VFIGIgv5EXa/uGMFQ7ADpAbC0vPWIrGqgHJ9OZDsw0Z8vk79EhrqaJl hAL0jXvKoSkCUcqQQdEdowQzFVDr+5ZafA+uZnbwR4GTj35hpD8+5SvuoObI9mw/sx 3hhOTtSP/JlJkiEDbHO6sFL8nfqTZkU0u3+XKXV945vSLaHzZOhpKZafxhWSWrnvr2 G67O5ocDXoa7FvFdpoHCN5hTmt8JiCghxO5Q++eveeA5kS3XVrAYsi+2+QFU7gwkvK ULNpyxZiuNk5g== From: Mark Brown To: Liam Girdwood Subject: [PATCH 16/20] ASoC: tlv320aic26: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:12 +0200 Message-Id: <20220602135316.3554400-17-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1759; h=from:subject; bh=WiEB+pSwz1R54EZdCeRTRN3malm2U97zeS+286opCE8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCaFqZZik52oZUnlmAjKIOhQPNLaMvlObaDKW+3 hGdmKpqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAmgAKCRAk1otyXVSH0Ki5CA CEQkGsbvy9ViWI7F0sf9Cc0EhU8ExP1wIkq1W0U1oIZgBAvenu6tvqDhsWAEXqkX8wIMu2UQA/3dm6 wpWtVuTgxoSTPAN+tebDfV2g/Gsm3ZXxQDBTmAUDV7JW5u7Q6zKJk1n8C3tOlmgApGtn8iC6srkkcg gtlxNFRPMPrwV0a68gh7J4/swHaixxl2dglORZRpRamD6zbzqJ96qo+3F3fXj9ETPy3gp4oZW/YtQH 8rh1LHQk9EgtFu987cwJ/st/FXzgozgOb34J6vGNakLOYUwD1zpetlvS0pVWklQOrKFrY4+kVNJ3HC NHC6XhmR0DlCGPQxNsfGSf7y0B50ex 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 tlv320aic26 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic26.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 077415a57225..1d756bef86ff 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -32,7 +32,7 @@ struct aic26 { struct spi_device *spi; struct regmap *regmap; struct snd_soc_component *component; - int master; + int clock_provider; int datfm; int mclk; @@ -117,8 +117,8 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, reg = dval << 2; snd_soc_component_write(component, AIC26_REG_PLL_PROG2, reg); - /* Audio Control 3 (master mode, fsref rate) */ - if (aic26->master) + /* Audio Control 3 (clock provider mode, fsref rate) */ + if (aic26->clock_provider) reg = 0x0800; if (fsref == 48000) reg = 0x2000; @@ -178,10 +178,9 @@ static int aic26_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) dev_dbg(&aic26->spi->dev, "aic26_set_fmt(dai=%p, fmt==%i)\n", codec_dai, fmt); - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: aic26->master = 1; break; - case SND_SOC_DAIFMT_CBS_CFS: aic26->master = 0; break; + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: aic26->clock_provider = 1; break; + case SND_SOC_DAIFMT_CBC_CFC: aic26->clock_provider = 0; break; default: dev_dbg(&aic26->spi->dev, "bad master\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578195 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 B5372C433EF for ; Thu, 2 Jun 2022 13:59:04 +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 F099C17EF; Thu, 2 Jun 2022 15:58:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz F099C17EF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178343; bh=hPD9UPXv9laZSn72/ca1ez0hRTUXIdXafWqHrvn5ixI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OtrZRpuI048DmpvbdvFOY1e/QZFsJV8RmjpYCgnpV/iSgM6OpJrIJw9BIDMEI8MLq wvwRD82nfGGeCsMPf04JqpoeooBbLa6hCPbLhRVzCCfKRVEYZiEwmAH/m9FzE6saWu smgJEzWn4ztNTixqYOxzbX18bIVyFtVF0mEkYIW8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 30F6CF805BF; Thu, 2 Jun 2022 15:53:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 93345F805A0; Thu, 2 Jun 2022 15:53:46 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3B92FF80571 for ; Thu, 2 Jun 2022 15:53:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3B92FF80571 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XIc7m+lZ" 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 ams.source.kernel.org (Postfix) with ESMTPS id A336BB81ED6; Thu, 2 Jun 2022 13:53:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B802C385A5; Thu, 2 Jun 2022 13:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178021; bh=hPD9UPXv9laZSn72/ca1ez0hRTUXIdXafWqHrvn5ixI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XIc7m+lZqp4nN+bFkiUfMf0TERUPyLPQt9Jtd/C/KTnEp8+PWDfT4XR5k9WvqydUh xlS8mliGH9MTEoNRZrnF/2Q7fgz78UgY8ADT+EOWeKn045zfP5LN5HLXkhbwF3/skn ZMYcXrPm5oowbMNXOBiMX1DXn5Tlh4u6PHbveiVXprZzry21+/w84vHE/pzJ24oB1S 9erbYM4MxgGXOET7L8tkz+1Cd5rQ86/WvxFC0sLljmKcjhUWmW8tOVsdf+kJPc1kx+ u0NFY+cY75JC2FNS7zQqC4jLb+D0WeXMQx90Lkb6r6IzcB34cPI1JtuLJ7SGwCSg2b rosFo/Nwe7w0A== From: Mark Brown To: Liam Girdwood Subject: [PATCH 17/20] ASoC: tlv320aic31xx: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:13 +0200 Message-Id: <20220602135316.3554400-18-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2292; h=from:subject; bh=hPD9UPXv9laZSn72/ca1ez0hRTUXIdXafWqHrvn5ixI=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCbxMAjr5QiYgBIhoKJOhyqzNql4pVL0D8qHxWi dbLweLyJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAmwAKCRAk1otyXVSH0PQTB/ 4lPCgZULI04vXGgdPMniUgR86Bav5YwoQAfpnRNW82UhsDNFOBdn1cgEM+4e00qt6UIkAVhBrAbXmp tBGSxbCalIx93MsUs/LlRYCq/ig6VlHMYQawuSflOYUEe+pPWqAZ8OzD9ibma6Xe2g1dYlnk4VfcCP FmbBIWsK4RBKI9P88A2s/FBb1TD0k0rsgIAVCUZqiTofb5FGu9Bw4aVxDG2Ta56Yj+CYlOxvaKvc0g ZxGD+nk49AuBRsXsjbU4CX0qbwE4ty+9uqwHjsunEud1PyacD3c06bx1b7L+OzhdNI7ZsL8+7+papK XTMO/K10jVkF7vkhIyZYER4Ui+t8MA 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 tlv320aic31xx driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic31xx.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index b2e59581c17a..aacee2367992 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1033,8 +1033,8 @@ static int aic31xx_clock_master_routes(struct snd_soc_component *component, struct aic31xx_priv *aic31xx = snd_soc_component_get_drvdata(component); int ret; - fmt &= SND_SOC_DAIFMT_MASTER_MASK; - if (fmt == SND_SOC_DAIFMT_CBS_CFS && + fmt &= SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK; + if (fmt == SND_SOC_DAIFMT_CBC_CFC && aic31xx->master_dapm_route_applied) { /* * Remove the DAPM route(s) for codec clock master modes, @@ -1051,7 +1051,7 @@ static int aic31xx_clock_master_routes(struct snd_soc_component *component, return ret; aic31xx->master_dapm_route_applied = false; - } else if (fmt != SND_SOC_DAIFMT_CBS_CFS && + } else if (fmt != SND_SOC_DAIFMT_CBC_CFC && !aic31xx->master_dapm_route_applied) { /* * Add the needed DAPM route(s) for codec clock master modes, @@ -1083,21 +1083,20 @@ static int aic31xx_set_dai_fmt(struct snd_soc_dai *codec_dai, dev_dbg(component->dev, "## %s: fmt = 0x%x\n", __func__, fmt); - /* 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: iface_reg1 |= AIC31XX_BCLK_MASTER | AIC31XX_WCLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBC_CFP: iface_reg1 |= AIC31XX_WCLK_MASTER; break; - case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBP_CFC: iface_reg1 |= AIC31XX_BCLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: - dev_err(component->dev, "Invalid DAI master/slave interface\n"); + dev_err(component->dev, "Invalid DAI clock provider\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578511 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 748AFC43334 for ; Thu, 2 Jun 2022 13:59:19 +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 C47AA17B2; Thu, 2 Jun 2022 15:58:27 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz C47AA17B2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178357; bh=dQmE76xeD7Ja2uR/DswiWe6qKs6uOmzj+r+Eg8l1LtQ=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=SThSNc19ykA60XKs0GhJZ9HVxRV/PUBEvk0ZdK/xT25PVL2ZkJ8qreYledJ88F7hy 2nROlntzvXXDWMP83vGDELtFRXQyxPUon9DFDAk8DI5TUWHuzSHpPKXfjGzH/jHzIa 8gAyKYRh/jMwJC4eMcUoAShwQR1NNzYk6fCQLuMY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id C1DF1F805C2; Thu, 2 Jun 2022 15:53:50 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id AB396F805B0; Thu, 2 Jun 2022 15:53:47 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9C003F8057C for ; Thu, 2 Jun 2022 15:53:44 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9C003F8057C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XlzJ2G1w" 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 ams.source.kernel.org (Postfix) with ESMTPS id 01F7AB81ED6; Thu, 2 Jun 2022 13:53:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D23EBC34119; Thu, 2 Jun 2022 13:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178022; bh=dQmE76xeD7Ja2uR/DswiWe6qKs6uOmzj+r+Eg8l1LtQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XlzJ2G1wdu+UohV41/AiGfsfHNlmuXr7sgy8WXkUkhlHOWOG9eYeV1Qrt+VNj2Gix H5+NSJxWzx0yQ7HCblPXDizU9fGwlaCShXHnc6pun34jXHpUyPZBpm6++CoIkP0Ak/ wa4wfxxCsUgwOh/NZkQ4LOgDGWH1nWPad1ul9+HetZ/4+B3rssFIRe3APBojJgq5H8 eEJa13pRbvr3d0uFu4869CasYWYZnrakbzq0S3NlJEF8v9p3ipNN2po5kofd7v4255 EkS2iRTX2dMmyzp7BBmClSas/XxGMS0W5rqsE98JS2kKc8BtVWXnqp55TN5IqDGX3n lagvq6Yjxn8nQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 18/20] ASoC: tlv320aic32x4: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:14 +0200 Message-Id: <20220602135316.3554400-19-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1194; h=from:subject; bh=dQmE76xeD7Ja2uR/DswiWe6qKs6uOmzj+r+Eg8l1LtQ=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCc7jX8V33FW7gX3/Rr0Lj6l4TMZ3klUa1gcnWC gO6PLhKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAnAAKCRAk1otyXVSH0Bq9B/ 45pPNEz8dYfP3qtbslxBLDUlzp1uoNtO+FfFxO9XhAqTAKuoLmypoQPsfZKm/ukeYOQ71Qmq56hKfU AAGXtcQ1/J1ZkEwDkzA/v7E3WlSVz3SSpgVcfXb1M5v/uUtPz8XDSUDdSqBoGzc8kmeiINfEk+DA2z B1mj+1jp8IQDW6FIz1zng2oz6l5c9FoIfr0brGkGkJzzg4LUroV/qP9J0V9aA4U0aWnkor5CQ7A0fe d8xjWog+agruQWhW917MyF+goVJe+wvhriQGvZJdaAcr3gORyel9NTBcDEgPCSdRPn15bB2dCS96Ga 3LRwVwnX9vpYwytdaBC9XCtUU3G78P 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 tlv320aic32x4 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic32x4.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index 8f42fd7bc053..a8e6adf62ac8 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -615,15 +615,14 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) u8 iface_reg_2 = 0; u8 iface_reg_3 = 0; - /* 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: iface_reg_1 |= AIC32X4_BCLKMASTER | AIC32X4_WCLKMASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: - printk(KERN_ERR "aic32x4: invalid DAI master/slave interface\n"); + printk(KERN_ERR "aic32x4: invalid clock provider\n"); return -EINVAL; } From patchwork Thu Jun 2 13:53:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578510 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 8BC8FC433EF for ; Thu, 2 Jun 2022 13:59:56 +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 CD83F17D5; Thu, 2 Jun 2022 15:59:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD83F17D5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178394; bh=fpEwUfAxjvS+H0wDAVvAN4L4mf0UkZC5zvLW4TChJS0=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=et2pLLYzRzbNaG6yvryvw9BTNxFyFTjfWu7Sg2TXVkiMU6pNIZT5zlhBjUIc+Vwra WJNGsZd1EqgllbCbQju2dRu/1p+50hkBTBjZzOWherbb2vXdjae4VLI8xc47ezf31V NMG9PutuHsOMVoMtEAxZj2TKaPvacziIMFALQg14= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 268E8F805D7; Thu, 2 Jun 2022 15:53:57 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3CE86F805D8; Thu, 2 Jun 2022 15:53:56 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E0DD5F805B4 for ; Thu, 2 Jun 2022 15:53:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E0DD5F805B4 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="d9Oq2NHJ" 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 6385B617D4; Thu, 2 Jun 2022 13:53:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EFE9C3411A; Thu, 2 Jun 2022 13:53:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178023; bh=fpEwUfAxjvS+H0wDAVvAN4L4mf0UkZC5zvLW4TChJS0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d9Oq2NHJvy95ezilGqeivEGLyDs7//9T8zF1G0uL6pnnQV6RUAOVviNoKPWdvWJ68 e0mYuM+EngtUe5nreyyYs6pOpATWNhpqR48NeQbQf/DEERC3mxB0cVTcH4SQ7LfQ8N hFP0iLGuMNkC//frq2qB+h0i2YUemi7HNtD5d/VpqZK+iJ4/YmFc30YggdIhMm7BCo l/AHP7XXb2QdiE3S2S5IZ5DUT8bpSb/w6OMsb0K6tWEOCydhRcTvU/k9lhs5GbUgvl d48we93T6y6If9QlHox+Rg+n2ZvA0J/bEa/NJexqhhwcvQa+/1OzJChIle/WVuFu94 98CrhX4k8MlRA== From: Mark Brown To: Liam Girdwood Subject: [PATCH 19/20] ASoC: tlv320aic33: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:15 +0200 Message-Id: <20220602135316.3554400-20-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1531; h=from:subject; bh=fpEwUfAxjvS+H0wDAVvAN4L4mf0UkZC5zvLW4TChJS0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBimMCdT+Rr3tfbRitgCr5+4AcJtyY3o8pHe6e/2Tn3 nkGBBoCJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYpjAnQAKCRAk1otyXVSH0BI1B/ 9u8XhYHDIhodbQPWncxeP/sQr0CTmemQmmWL0QdUDCz6DCVPaqudEKUomUYKBJwIgcZqbIPVJMKEai iKbsUdTzuuxS7lvQmAy4msxxzbEDBtgxPRdTZ9bPwAUhACeA2RPvsxlJuB/U5qXSD7Q+RpZQrQY7XH U6b0g4nm7ICkkHVvwofIw4RSgETYMcL6Kj4Q4ueqIRsNxKpOa/jwb6RRPcGl0sGURfy3RIBWYNV3hs JhVS8i6D/fsg2rdEeYxpW7jkxJNdkJ4gOpeQ8HeMwU+iCDx1mS2hSkK36A+yr3NBOIaxEtje1x3hrI C+ML5xUNLYovIWO0jcB0N4vmLDWRXf 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 tlv320aic33 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320aic3x.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index d53037b1509d..610e41bbf388 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1253,22 +1253,21 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai, iface_areg = snd_soc_component_read(component, AIC3X_ASD_INTF_CTRLA) & 0x3f; iface_breg = snd_soc_component_read(component, AIC3X_ASD_INTF_CTRLB) & 0x3f; - /* 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: aic3x->master = 1; iface_areg |= BIT_CLK_MASTER | WORD_CLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: aic3x->master = 0; iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER); break; - case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBP_CFC: aic3x->master = 1; iface_areg |= BIT_CLK_MASTER; iface_areg &= ~WORD_CLK_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBC_CFP: aic3x->master = 1; iface_areg |= WORD_CLK_MASTER; iface_areg &= ~BIT_CLK_MASTER; From patchwork Thu Jun 2 13:53:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 578194 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 16356C43334 for ; Thu, 2 Jun 2022 13:59:45 +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 5E65D17D6; Thu, 2 Jun 2022 15:58:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 5E65D17D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654178383; bh=uPk8icP4bARsrrVE4s+cg0Z/KWet4VBYf1FxuTnTIJU=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=c7NdTpa4ASrCER4kg1h6C0qmPeVKp/kVEVGtB/zuIYc8zOst7NhPXeT5PhjSZnbfO lRnVTl1K1OfmoLF+p6P58DvP/7FfwHEY7GxdovrdCOA865zZethAGUJh8ZlANmGwHU ViCAHEwiEsOSOLoc7dTnhCp7aAJ4SgZcjdxZojcY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A8B54F805CB; Thu, 2 Jun 2022 15:53:51 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 595ADF805C2; Thu, 2 Jun 2022 15:53:50 +0200 (CEST) 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 DFC6BF8057C for ; Thu, 2 Jun 2022 15:53:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz DFC6BF8057C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SUHt5n4J" 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 76B82617D7; Thu, 2 Jun 2022 13:53:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 330F1C3411E; Thu, 2 Jun 2022 13:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654178024; bh=uPk8icP4bARsrrVE4s+cg0Z/KWet4VBYf1FxuTnTIJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SUHt5n4JcGJFbTGbZDOL9oH3T5ngvwSipyLhJUbcfJy2MAG/Hhala3zsRMlhzAu8h 1oWucn/AOGaUb7gOluZGIYIlC8VMw+VPcYXlpoxeZsDUUM9UBmCOOEZhokmL0vU0of +IfxWEXb90L4faiwkdd8TDda2l3rrRbeqwzcGgEG++2lrrnM3ljIphQwBSQl2FznN6 mXJsmgla8h8LJLPpa8jBvb2rRNfxBCM6PEObDCgZJb+Df6eKAhINwvVPm7GkZm/jo1 DO6yYSUTobl14tqD76GVhr6+ioVMa0knmHmorxyIZAiG4kcJnMO1bvJvXmnhIk82oE MBUQADJQ1v9LQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 20/20] ASoC: tlv320dac3x: Use modern ASoC DAI format terminology Date: Thu, 2 Jun 2022 15:53:16 +0200 Message-Id: <20220602135316.3554400-21-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org> References: <20220602135316.3554400-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1367; h=from:subject; bh=uPk8icP4bARsrrVE4s+cg0Z/KWet4VBYf1FxuTnTIJU=; b=owGbwMvMwMWocq27KDak/QLjabUkhqQZB+Y23gnMNC0oP1TVXy7St2FplVfM45Tp3QWnC+Xii77F CzN2MhqzMDByMciKKbKsfZaxKj1cYuv8R/NfwQxiZQKZwsDFKQATWe7J/ldWmHf93m7OJKdPPULZbh MZv2xYLdx01KR2v9atepeS2GfcBVdWSj3fasXmvC6ZLyvKLti4oOrgo6en8zKamp9LveBO563PmuBp ekHw05+gkilis59rpumdFz6QnX1BNW0pT/5B9hTmPIfKWxsztzEovb6rprmnXsneksUldatRIEOc4x 2jwmUO3o7Ll124E/ey7LWU9dIfwjYzdfWOLJupdODElAbxyepSFUKiNh/VX3DYezu0/lsT/7Jc6Txj /A4lmw0OS9jiDZjkDnF7GuibLTgYvPFSKcsrXbkXjIEib6VPy3hZxb958XLJQ0m1X57PwhY3TCnb8X vLST/uRY87IhpTVlV/+rPQW/0MAA== 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 tlv320dac3x driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/tlv320dac33.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c index 66f1d1cd6cf0..371026eb8f41 100644 --- a/sound/soc/codecs/tlv320dac33.c +++ b/sound/soc/codecs/tlv320dac33.c @@ -1317,16 +1317,14 @@ static int dac33_set_dai_fmt(struct snd_soc_dai *codec_dai, aictrl_a = dac33_read_reg_cache(component, DAC33_SER_AUDIOIF_CTRL_A); aictrl_b = dac33_read_reg_cache(component, DAC33_SER_AUDIOIF_CTRL_B); - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - /* Codec Master */ + + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: aictrl_a |= (DAC33_MSBCLK | DAC33_MSWCLK); break; - case SND_SOC_DAIFMT_CBS_CFS: - /* Codec Slave */ + case SND_SOC_DAIFMT_CBC_CFC: if (dac33->fifo_mode) { - dev_err(component->dev, "FIFO mode requires master mode\n"); + dev_err(component->dev, "FIFO mode requires provider mode\n"); return -EINVAL; } else aictrl_a &= ~(DAC33_MSBCLK | DAC33_MSWCLK);