From patchwork Tue Feb 22 23:40:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545266 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 81CCAC433F5 for ; Tue, 22 Feb 2022 23:41: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 9C10A17FD; Wed, 23 Feb 2022 00:40:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9C10A17FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573289; bh=r/brEUzJy5I6Xo3alAGUGuz0VXqCv0hf22/7mJ0r5jc=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=I9NN9eaEasza8rlnLtAB2oZdWYHnlpCzJRD/UViOu96JF29bUo5YAHdy3WNerrZGD 5v4ow/G2nNq1Y5qjR4Rsdtss82xDwlZP0gLfwdGGoZX7BvyOOejdfF8QvtOI/rBsDN jfJ1KFvgERdp76BHflKcLzobAKdPxVC1SeKtpm4E= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1BE02F801F5; Wed, 23 Feb 2022 00:40:39 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 082E6F801EC; Wed, 23 Feb 2022 00:40:38 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5F636F800F5 for ; Wed, 23 Feb 2022 00:40:34 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5F636F800F5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BXk7NO1Z" 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 CB39B60DE0; Tue, 22 Feb 2022 23:40:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22CDCC340E8; Tue, 22 Feb 2022 23:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573232; bh=r/brEUzJy5I6Xo3alAGUGuz0VXqCv0hf22/7mJ0r5jc=; h=From:To:Cc:Subject:Date:From; b=BXk7NO1ZlcfmYkpINJwwnfeMStahNQTkXY1ale9G0MENmjOhUmfoNuS0eB9DRHnCf PIysjT42ETzWt9WmFRrDfjpZCbpTX79pL6m2cJdyP7W7NerqCZrD3pAzp/rRg0i0fw cjEQPBR6V4tKndT6q/GcNESDGtqlmLolb+pcPNmyDjMym8vEaBrI3D4O/vZt4xotCR aOzh+WWnaeMYmC0qHVIqMvGEK0gz+iUr2nEd5Ssx6JxijN+cb2q01hc6KGHcKMIv2J 34g+c33ySCqVXl+0BOWTW2Xf3Tot5/o4yBDg1BA4Ixv3idftfhVI0ORkQNNWdg/jeG CkcejL9DTwoqw== From: Mark Brown To: Liam Girdwood Subject: [PATCH 01/10] ASoC: max98088: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:17 +0000 Message-Id: <20220222234026.712070-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3076; h=from:subject; bh=r/brEUzJy5I6Xo3alAGUGuz0VXqCv0hf22/7mJ0r5jc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQlmafLDQzjIwz+aKZg5KsfU1ooSEW7z8M2OEja 7AAPkyiJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0JQAKCRAk1otyXVSH0DbnCA CFiOqyQxbbF00NK9B79uRjVbuqHkYLnn04un4M1VaZAQtwNWMAjFtoXUUFTfCyZEBQ3vbLQvyA/7L5 lpRv/qkswUauIy3WTAhNo91i7Buo9DdBPOdamfzYPE+4MADp0D9ISF64I9GJ4GFvOer4cH6Mui6dxA tZLNDjWR6ioKThjBTur9P4aNhvx5LObkGGUGmG0ihsG9uD3qicQFSsggOV03rHeeI2Kdv4UrpZBsZY jvW14wI5etWy9SxFhID4wxXfDpnibAflX0XUuxIMlkJWEVriIwPeMFhIMWHoQnuSbQj0lbYqMgyVFY 7R91LRFK1MF9F0AgBZaMk7oM/E5nEU X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98088 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98088.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c index f8e49e45ce33..429717d4ac5a 100644 --- a/sound/soc/codecs/max98088.c +++ b/sound/soc/codecs/max98088.c @@ -1156,20 +1156,18 @@ static int max98088_dai1_set_fmt(struct snd_soc_dai *codec_dai, if (fmt != cdata->fmt) { cdata->fmt = fmt; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Consumer mode PLL */ snd_soc_component_write(component, M98088_REG_12_DAI1_CLKCFG_HI, 0x80); snd_soc_component_write(component, M98088_REG_13_DAI1_CLKCFG_LO, 0x00); break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ reg14val |= M98088_DAI_MAS; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "Clock mode unsupported"); return -EINVAL; @@ -1227,20 +1225,18 @@ static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai, if (fmt != cdata->fmt) { cdata->fmt = fmt; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Consumer mode PLL */ snd_soc_component_write(component, M98088_REG_1A_DAI2_CLKCFG_HI, 0x80); snd_soc_component_write(component, M98088_REG_1B_DAI2_CLKCFG_LO, 0x00); break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ reg1Cval |= M98088_DAI_MAS; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "Clock mode unsupported"); return -EINVAL; From patchwork Tue Feb 22 23:40:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545056 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 827B4C433F5 for ; Tue, 22 Feb 2022 23:42:01 +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 B89F918C6; Wed, 23 Feb 2022 00:41:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B89F918C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573319; bh=jnWz43F5iE+WKksdHdiiN5/7CIbxMSrEkWTU4Iql3qY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OJzfpE0eLEo4ObmtnnqTKlqNn2vSX667VFMlU5+RVoES+aNdNjcjhIXxILybUyp+p uap1yddy5kJlF3JIqQyUQZeQlZRGQwMUJ+JaH9CPuKdvxYwot/5NjzjsXa0ZZDDGRO yqrlhO3DZdZPUoInZOyT008g1qWNeVphpF45aJQA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 04908F801EC; Wed, 23 Feb 2022 00:40:43 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 08ACBF800F5; Wed, 23 Feb 2022 00:40:40 +0100 (CET) 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 13DA8F8012C for ; Wed, 23 Feb 2022 00:40:35 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 13DA8F8012C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rrULc1Yf" 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 4A47161137; Tue, 22 Feb 2022 23:40:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A535BC340F1; Tue, 22 Feb 2022 23:40:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573233; bh=jnWz43F5iE+WKksdHdiiN5/7CIbxMSrEkWTU4Iql3qY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rrULc1YfsyztcczKqR64UCgZ7JEwstWj4lMWKiuS5LMjeMsnDlCYzy7CfiH4T9Z4Y olMWKeWNtwcE4ubJr1e90gQ+PXPJ1Etbt9xCNigWVFXG3HOaPc0KzNweTX/eZtcWGz YZeYru6FvDPl9kM1A/ak63VE0ZcGDZopPDcf1O+qGGWG07BU2zLlJlS4oZsSZ8nIFT i40r44orirmv2Pq2IHXT2Ez7xMLQkCGMY4rbgKmHGcoNIpa/TDMuti+OpzE3Oi8A/L AVqLhgJ57GJl4HwTUoJxEAqRe61mRs102GWcnLZ+pbloMtNfn8ZE9XbVuk2jIFOWGC hYYj2+zSPpBtQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 02/10] ASoC: max98095: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:18 +0000 Message-Id: <20220222234026.712070-2-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3118; h=from:subject; bh=jnWz43F5iE+WKksdHdiiN5/7CIbxMSrEkWTU4Iql3qY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQlPGALgIuXnOD94w/Fx5URH5UuqDCIA0uFwpi7 q2tR/fuJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0JQAKCRAk1otyXVSH0NGsB/ 9RAsZx7VrBQ09/I1MypYQDJ5L0XezoJSztWPibY3cLVMgew+lkUtrdmGu/K5SmkOkgBmPP/VsAtAf0 TSrZmuUylxdVqQMJgwVcEhnMVwifDmlOmLVMe2S94jVyBLN7UP2DCWSB9nqPV2gGK2dEuk3/ryRVN3 e45AqhUSIZ5FR37CI40QVMR93wRmy9S/l/cGM4fPzCFuk0MKbKL7UZZxaaMKqgFtBDKeiMKMPQu49s 1dPXiyvrMbH95YDt07jPifAFv9PvEUG9Hx+UyLMkagxWiTuYeG2omZSNaL3CodNGMXdd6POd7cpxaH Gdq3HA3IPkBeqVWgojvM91qI++RSw/ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98095 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98095.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c index 736cd70be725..4977b00ddf5f 100644 --- a/sound/soc/codecs/max98095.c +++ b/sound/soc/codecs/max98095.c @@ -1168,20 +1168,18 @@ static int max98095_dai1_set_fmt(struct snd_soc_dai *codec_dai, if (fmt != cdata->fmt) { cdata->fmt = fmt; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Consumer mode PLL */ snd_soc_component_write(component, M98095_028_DAI1_CLKCFG_HI, 0x80); snd_soc_component_write(component, M98095_029_DAI1_CLKCFG_LO, 0x00); break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ regval |= M98095_DAI_MAS; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "Clock mode unsupported"); return -EINVAL; @@ -1236,20 +1234,18 @@ static int max98095_dai2_set_fmt(struct snd_soc_dai *codec_dai, if (fmt != cdata->fmt) { cdata->fmt = fmt; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Consumer mode PLL */ snd_soc_component_write(component, M98095_032_DAI2_CLKCFG_HI, 0x80); snd_soc_component_write(component, M98095_033_DAI2_CLKCFG_LO, 0x00); break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ regval |= M98095_DAI_MAS; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "Clock mode unsupported"); return -EINVAL; @@ -1305,20 +1301,18 @@ static int max98095_dai3_set_fmt(struct snd_soc_dai *codec_dai, if (fmt != cdata->fmt) { cdata->fmt = fmt; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* Slave mode PLL */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: + /* Consumer mode PLL */ snd_soc_component_write(component, M98095_03C_DAI3_CLKCFG_HI, 0x80); snd_soc_component_write(component, M98095_03D_DAI3_CLKCFG_LO, 0x00); break; - case SND_SOC_DAIFMT_CBM_CFM: - /* Set to master mode */ + case SND_SOC_DAIFMT_CBP_CFP: + /* Set to provider mode */ regval |= M98095_DAI_MAS; break; - case SND_SOC_DAIFMT_CBS_CFM: - case SND_SOC_DAIFMT_CBM_CFS: default: dev_err(component->dev, "Clock mode unsupported"); return -EINVAL; From patchwork Tue Feb 22 23:40:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545265 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 5BA7BC433EF for ; Tue, 22 Feb 2022 23:42: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 7756518C5; Wed, 23 Feb 2022 00:41:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7756518C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573340; bh=b0Yrw6AijktqmcZ5sbnJTFvkuRvsvDeSnGcTpNUPICw=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=FCXvGwl3xTJmsS0ruLdKIJenyqY0jdNEy/sFqCkWPUnNFFMgdxcv1XLJHI5IdzCXe wAda48QOwNDqc6NV1iziZhNeyoIMPzy1kuFMznpL4uIJ9K2/dSL2mkGpQAJ53QoTie zMla64GbsZZUbGLPcKhF58+5R8lA6eNkG90HfQI8= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 809EFF804FD; Wed, 23 Feb 2022 00:40:44 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 60DB2F80311; Wed, 23 Feb 2022 00:40:41 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 5D61BF80118 for ; Wed, 23 Feb 2022 00:40:37 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5D61BF80118 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HGUNFn5T" 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 C679E6113E; Tue, 22 Feb 2022 23:40:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CCC5C340F0; Tue, 22 Feb 2022 23:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573235; bh=b0Yrw6AijktqmcZ5sbnJTFvkuRvsvDeSnGcTpNUPICw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HGUNFn5Tarmn9Xmzfv0yuNxFS1n2BkUkuV1Jn5OQWTc1HWiqIfVjWdPMDCjy32Wxl acm5m6wvKRAP3oy43tQu2AZZwklosoJn/ZF/KlE4AHG24H/qjvEn9UJenUZ39XfTWU mBwNZg5cW7UUgzLRr0IiN1INTybxosTDNNyK0Y355+aVrmE53PGJyLDP49ArDTMqsG EG6m6Aiyqdo8L0lVnVMLbqXlsIQzhq4GkGR93ZRoQAJsm9j34JThUrW7iLit3B9Wgy fWvfrrZF7a/wa1nuQ7g2NVVOmttK7kZb6SCwFn/PHkSY6E/OVAkrjhveGoNvgRTHKY 87eE1vSX93/NQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 03/10] ASoC: max98371: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:19 +0000 Message-Id: <20220222234026.712070-3-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=923; h=from:subject; bh=b0Yrw6AijktqmcZ5sbnJTFvkuRvsvDeSnGcTpNUPICw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQmimh+xaUbSU0HTYOwLVVaQmZOgXUKw0AzIWLR aVCB8cOJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0JgAKCRAk1otyXVSH0JmmCA CGKMhgjM5Q3IwATX6namrCCVi9sUqsbYFtnolmcsfEDqwfRsVZLr4q+nD7+QHzO6z44Xlo1byabef6 4nWBu/9AHcpoKLYTy5aMnRN1p4drIkUZzPL1TZiouSQiZyivjR0n2W+BWn9VVRnlWZv6LL75DhCQtT 5SS9wYpoxRp7OTPEdkeUUphTZLZrP8xrmhOrZAkQKd8YgPO+0V/+2QpzyVPlUpjaGTXkVHmLCOjh3f pzPkck2VbhUEJBWxPsG3ifHUi7np+BZ0WO2zjVvaIdwzJwdhEQvaWOduPCKWPrB85xOYPA2pe9z687 Fus9Pck4kq5Sq8wJTmePdYuTmIEyEH X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98371 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98371.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c index e424779db02b..8d42f523e420 100644 --- a/sound/soc/codecs/max98371.c +++ b/sound/soc/codecs/max98371.c @@ -184,8 +184,8 @@ static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai, struct max98371_priv *max98371 = snd_soc_component_get_drvdata(component); unsigned int val = 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: dev_err(component->dev, "DAI clock mode unsupported"); From patchwork Tue Feb 22 23:40:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545055 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 D59ABC433F5 for ; Tue, 22 Feb 2022 23:42: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 12D8818B5; Wed, 23 Feb 2022 00:41:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 12D8818B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573359; bh=h7hW/1oAn71EzGJnMnxoywwX4Q1V0B/wAoZRx+0BrzM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Zyrj0QJ7coI99AWgvehQ5NurK8jqO+yccms9PZ8II0rNYMKto1nUdEzwKTPeOkzl9 7H86s21vHM0Ul3iAOtNTmFUB23zhaRYHR9zZnWz6gLFyEpxjZtV2giwLSuZxAZM+cs QUxC3a/wfYXi4Gxdt4no9a2zCHTBNwCoJG0XwE7g= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E77DEF8051D; Wed, 23 Feb 2022 00:40:46 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 15E0BF8012C; Wed, 23 Feb 2022 00:40:42 +0100 (CET) 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 6F087F801EC for ; Wed, 23 Feb 2022 00:40:38 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6F087F801EC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r7sPGkz+" 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 EB1BFB81D5F; Tue, 22 Feb 2022 23:40:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5DA5C340F1; Tue, 22 Feb 2022 23:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573236; bh=h7hW/1oAn71EzGJnMnxoywwX4Q1V0B/wAoZRx+0BrzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r7sPGkz+uYZngqErWyweuSPlqhLDW8jscboEjnoz63N3AUsk9u7WktE4flkxYm+Ha FCsOa9SdbgU9BuJp1sN45osIu8MoDz1ZdAACNZYyCxw3v3dzBYKTNC68z/1UfEjX6u AL93Ye2pZw0BDaDOPJ3krRVyklDki4HWYlyj/AgWnplVmXaYpFZ81bKB2DwMDjNd+8 OTG306f88pnYqh1RtqCXxFyERl1nqY4UVDJve0raGHJJwG4P1bNgsJzGBSyKX6wOgu kDq+pmE56WDxn0GYoVsbDgGBbq0YSq2jnpi6JY1WIH/Bpi12Ou/aYH4BVQqyUeY6uc RuePe1va6gwGQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 04/10] ASoC: max98390: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:20 +0000 Message-Id: <20220222234026.712070-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1834; h=from:subject; bh=h7hW/1oAn71EzGJnMnxoywwX4Q1V0B/wAoZRx+0BrzM=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQnphXGHRDjPWmkzr++fqE509m3bPcGcrL29Uv2 mNtrFQWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0JwAKCRAk1otyXVSH0DV6B/ 9jj1QJyMOscK3sN6n2wUPTTc7sbiWXB6UJNuw/Jij4zSI4ZTFeDUKOVXdmQe8L64CnvaOTv+7iApV5 G9ba7TbdT0CkvbO/H4RkbOOEGK3RW92Gpk9BWc6c9QD7AoZRzsHHP7EHX8Ao2s7m2N/m+KqWsJzN9q WL3NkAHCp8PZdKkOW5C+FBIF7VqWaqTcVt4UieUtUWSczLdXpIIlL1tK0TGrXyY3e2y11xGHDXyXBL tWk0TLIZfPDUyCDYwq5f4TiDesFHQ6HDKiIwf8AB3Xf3RVIpSLGHGuzBNtY5wsruEqR6WCRL8N/2MO l6qCvdWL2KWyxqUchpeoQJm08Q1i0d X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98390 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98390.c | 10 +++++----- sound/soc/codecs/max98390.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c index d1882cbc9381..40fd6f363f35 100644 --- a/sound/soc/codecs/max98390.c +++ b/sound/soc/codecs/max98390.c @@ -174,12 +174,12 @@ static int max98390_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); - 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: mode = MAX98390_PCM_MASTER_MODE_SLAVE; break; - case SND_SOC_DAIFMT_CBM_CFM: - max98390->master = true; + case SND_SOC_DAIFMT_CBP_CFP: + max98390->provider = true; mode = MAX98390_PCM_MASTER_MODE_MASTER; break; default: @@ -265,7 +265,7 @@ static int max98390_set_clock(struct snd_soc_component *component, * snd_pcm_format_width(params_format(params)); int value; - if (max98390->master) { + if (max98390->provider) { int i; /* match rate to closest value */ for (i = 0; i < ARRAY_SIZE(rate_table); i++) { diff --git a/sound/soc/codecs/max98390.h b/sound/soc/codecs/max98390.h index c250740f73a2..f4d6758ab4c6 100644 --- a/sound/soc/codecs/max98390.h +++ b/sound/soc/codecs/max98390.h @@ -656,7 +656,7 @@ struct max98390_priv { struct regmap *regmap; unsigned int sysclk; - unsigned int master; + unsigned int provider; unsigned int tdm_mode; unsigned int v_l_slot; unsigned int i_l_slot; From patchwork Tue Feb 22 23:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545264 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 EEB14C433F5 for ; Tue, 22 Feb 2022 23:42: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 3CFEE18D9; Wed, 23 Feb 2022 00:42:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 3CFEE18D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573371; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=svPnFv3afxcsGLjvmddoHSy4776p2Xta4x5lt0sEt/lTUFZN3triozi96kzr8M87e +dJE7OSTZQ9p8p/yxm/9PPU83/nIJ2I2ClBjJj/Ax2NQnHz+onaqwkV1Mg4SGc9gFz 8cMdg+iYHCSdtAOqTg1UojtKKNGscrye+yLDJWs0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 247D2F80520; Wed, 23 Feb 2022 00:40:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id F1826F800F5; Wed, 23 Feb 2022 00:40:43 +0100 (CET) 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 5E539F800F5 for ; Wed, 23 Feb 2022 00:40:39 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5E539F800F5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XYMF4aWo" 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 84701B81D63; Tue, 22 Feb 2022 23:40:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A68FC340F0; Tue, 22 Feb 2022 23:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573238; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYMF4aWoRz0igRCDoQLOM9+zkQUFjulE9+leL88ys+TRYsCr5ezCasbYsIY/8zvxY eCqu21rfa4eMsWIWpUJM92LRqiu6ObFQOFpDtCDVY9Kewk44KjXlpmsEzVQWZ8QM6D 4WICeUZkiKwFmShF/Z/3u+KNjPFc4Oe0lmGxCcVCL0rxFyMjTz5eW8c1M5jjVI+VXo lkjY1AZfoAnB4gOyFoLh4zE37skWXSdrmBJFvLf/mSyCkhlvA3Rxvyvn73R7nsN8Bt jOz0Nn+BCtR+fCIExpJE9ODGZ3A2UbgahXdknJXWLmCWMw1gZ080ib+bpv9NjyD1Zm Z2qPkAfmy8L5g== From: Mark Brown To: Liam Girdwood Subject: [PATCH 05/10] ASoC: max9850: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:21 +0000 Message-Id: <20220222234026.712070-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1066; h=from:subject; bh=F15XP7CFp7dDl7I3vTiMJ5jCE5AW2UbeE6cgDLKz2Pw=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQozkG49wUmPcw5jU6ouTgcomKzQkEbUUAP0P8B oNaU39mJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KAAKCRAk1otyXVSH0OFLB/ 4xJcYpRD5l+IZWnWBHdVocOG+MtKQ484pr1B439FMX2AGiuZ6EACvBdRj4idKXrpWMgw1wErzjP0Ef WlfpqicsM6Md8+PQPXFaaGSxgRJSBxKZ27qoZpLv9+JXU8ar0nAGBxek6TZtH4yXEcqOhE6pNYmsfb 6EM9al1ABYbaS9KtHjUwGOe/IHLExroO3OcrqPYbi2dRJ4FzcBkeQlI6llO9q0ieSpTMnMk+1xdn6K ef/CotXVW20bu/g2AckAnofjvZAqeIApg8TABM7/zRuOrUZ4Go74M/kA2m4HBCsbjwaviOV74V6hSg JDeGaEA3AMcO/cKofGJKRmFzKbswP/ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max9850 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max9850.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index dec51893af74..e073f0e029be 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -173,12 +173,12 @@ static int max9850_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) struct snd_soc_component *component = codec_dai->component; u8 da = 0; - /* set master/slave audio interface */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: + /* set clock provider for audio interface */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: da |= MAX9850_MASTER; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: break; default: return -EINVAL; From patchwork Tue Feb 22 23:40:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545054 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 BF8F9C433EF for ; Tue, 22 Feb 2022 23:43:12 +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 0964818D7; Wed, 23 Feb 2022 00:42:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0964818D7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573391; bh=yQDDaek287Ow03a0bQ6Azy4TwUQmgpCNrneCyq5YYns=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=DhYorlW1oA+tXEr+flKaLS+kJrYLG5Es/gs7mUvVb0Fe17xvEOfCjE3gL5SuYA87R LRzMNjQIAv8mAkfa6gZBc8ylT875SkEH78xqvt12leNYXZu4Q9pJwqgFy7X6+fzwTa +xhEt1QJpdfurbDBclk7U5wCfHw4hkx3PNasp7qo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A3C63F80524; Wed, 23 Feb 2022 00:40:48 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3DF1BF8051C; Wed, 23 Feb 2022 00:40:46 +0100 (CET) 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 CE4ABF80515 for ; Wed, 23 Feb 2022 00:40:41 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz CE4ABF80515 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c9JxOcZY" 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 0904DB81D44; Tue, 22 Feb 2022 23:40:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3DE6C340EB; Tue, 22 Feb 2022 23:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573239; bh=yQDDaek287Ow03a0bQ6Azy4TwUQmgpCNrneCyq5YYns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c9JxOcZYyjxm4f2MWJrwivWSICIIZGIXMw39b2oPN3RJgCkr4/8QeQJ+cnm37GD5W m/q5Wgk/ih72bGCixpgHNzhDoFenGeDWaVF7z6ctEZKlATTD7bfxsU+wT+olsyItuf TUBeZj0SJp3b2fAHHnDh/6h/s+LdiGbLCtHWCWzLdDJ9P85JHEq0AdYUWPXiYmN4Yx dKBCJXxU9OSiczyOTSfzWyiwSAgHB6CkP4nPVhCi587jqpk372KGk1TlSgudqvMc9Q QZJ7oARQ5+C761VEHYJezdBpgql7Pyz6EgG/u0oHNsZuKZP87VOQnkJTSUXELWqCoc /J4g1va2WBN/w== From: Mark Brown To: Liam Girdwood Subject: [PATCH 06/10] ASoC: max9860: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:22 +0000 Message-Id: <20220222234026.712070-6-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=962; h=from:subject; bh=yQDDaek287Ow03a0bQ6Azy4TwUQmgpCNrneCyq5YYns=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQpNAY7zn3V/6kRAwICAKuV2nizw66DThAJNqIU UFsiFF+JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KQAKCRAk1otyXVSH0OlMB/ 9K9eLywZG+XzS9AW5beo1XV/IF05a/i2PncG2gsU1jzJZIYs8mTQuc5HGPTtdhyaUQUGIY0DpIYELa iyEHGjgYZ0mB8JPrCD6LefQhD3un4N0GsIFTGj5ySNk0ypUTWv/yL5CfnhoagvTQlk71eMXkQsvdGo RNJoi0r2sZClsA1KMcAsX628ZmYty3HhHQBSm/ml5RYM88xpovRLTMbakFVZRO8OafE98zLDNiRfT0 H/eZiMhtCVaqJUSGraS86cJ1ccz+ifLFs+OkwiOLSZvwGSqdsiEUv/R+VAEyQgYDnNO6C9YvrvZa2z RIQVp4gZx/OauqijV2Yq1te34Md4Jc X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max9860 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max9860.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/max9860.c b/sound/soc/codecs/max9860.c index 7c9686be59d9..82f20a8e27ad 100644 --- a/sound/soc/codecs/max9860.c +++ b/sound/soc/codecs/max9860.c @@ -268,11 +268,11 @@ static int max9860_hw_params(struct snd_pcm_substream *substream, if (params_channels(params) == 2) ifc1b |= MAX9860_ST; - switch (max9860->fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: + switch (max9860->fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: master = 0; break; - case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBP_CFP: master = MAX9860_MASTER; break; default: From patchwork Tue Feb 22 23:40:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545053 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 ED726C433EF for ; Tue, 22 Feb 2022 23:43:43 +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 08F4A18E4; Wed, 23 Feb 2022 00:42:52 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 08F4A18E4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573422; bh=QbRs3di/FkyL2pw02uj/oYyr+jPs92Uy8K2Sk02jeL4=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=AO7pXVN0X0xF2bLWIqDmW287gvDoQzpidCAA2ISLqbmzea03KSaBAlsVO9CAsVymi DBJIzH/Phgvp5prFAtltttQJO4CHFKjkYWO6vWkgFr4C2FsY7JmVCMUkMmtgtF1Fgj voVscph+S8PDCDNDXHJuqquby7jXEpDiSZXx05fo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id F17CAF80534; Wed, 23 Feb 2022 00:40:49 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 36E0BF80519; Wed, 23 Feb 2022 00:40:48 +0100 (CET) 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 20F1BF80519 for ; Wed, 23 Feb 2022 00:40:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 20F1BF80519 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P3uy3Vr3" 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 8D271B81D5F; Tue, 22 Feb 2022 23:40:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29017C340F5; Tue, 22 Feb 2022 23:40:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573241; bh=QbRs3di/FkyL2pw02uj/oYyr+jPs92Uy8K2Sk02jeL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3uy3Vr3fgMklxwluEzySWCGIHUqjLYqiRH6K/eKCR4vguYESMoF4TmA+dkPP2K1d ziPFOEnZLWL8eB5ZnS8VZkqLd145velFYf8eLyKBD83iA8ymdNFUQa3jy3EhGr2lx9 4oOLvXJ2SKC5XtBbejZLoLYp/cL/bGACOkIJK+NHXvkv9AgzazCARu6Zp82BXGNTEH dcI+9jQ4IL6e96WsPH3CzQXwGwlcnDBgmOPk03yFHmDGYbCU6TPJOmF6NrD7zRGtKU 1xVjRaMCq42Sjx3wUhYaCdcuHzHCA/R2kNTSNa5rG+6bfign0HgF+0c5fqdj0SGZ+c xkmLRHqZyDoAQ== From: Mark Brown To: Liam Girdwood Subject: [PATCH 07/10] ASoC: max9867: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:23 +0000 Message-Id: <20220222234026.712070-7-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1754; h=from:subject; bh=QbRs3di/FkyL2pw02uj/oYyr+jPs92Uy8K2Sk02jeL4=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQqQdkllOk96fYB1cR3bGOky2MxO5CCJYDmVcMz dOr7h0SJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KgAKCRAk1otyXVSH0GJWB/ 0cuE/+ZkbKqxLoF4cBYOYE70r2vqINe0Rk+LOnrWM/mvHYyu3PerYboSut6ycb4zXH2uvjo4/14od/ WRM0nDd6CS87Bkqgssoj/wTlUAMHRZyABQE82OqKXk9+ynD2nGMS/PrUcS+co9ijlznOUm0+3azTUN ukwW9vkCIC+X1ZXkAe/E75iHtfU42yzXb9sHLleBDZJu2y7IOy5pajIHJBHEbgodpLhjGX5I3Fby68 ZpdJpf9BIBvsa2CJxBphy8BY6OQGo5a/uef16BFGojyHKrZxG0zOriUBRvu84sHZh+MfIsGRy0cmE2 3lcoaCWLD3/sC40UsMA2wwpEDub70i X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max9867 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max9867.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 09b2d730e9fd..c2b1151c75cc 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -19,7 +19,7 @@ struct max9867_priv { struct regmap *regmap; const struct snd_pcm_hw_constraint_list *constraints; unsigned int sysclk, pclk; - bool master, dsp_a; + bool provider, dsp_a; unsigned int adc_dac_active; }; @@ -335,7 +335,7 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, MAX9867_NI_HIGH_MASK, (0xFF00 & ni) >> 8); regmap_update_bits(max9867->regmap, MAX9867_AUDIOCLKLOW, MAX9867_NI_LOW_MASK, 0x00FF & ni); - if (max9867->master) { + if (max9867->provider) { if (max9867->dsp_a) { value = MAX9867_IFC1B_48X; } else { @@ -442,14 +442,14 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai, struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); u8 iface1A, iface1B; - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - max9867->master = true; + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + max9867->provider = true; iface1A = MAX9867_MASTER; iface1B = MAX9867_IFC1B_48X; break; - case SND_SOC_DAIFMT_CBS_CFS: - max9867->master = false; + case SND_SOC_DAIFMT_CBC_CFC: + max9867->provider = false; iface1A = iface1B = 0; break; default: From patchwork Tue Feb 22 23:40:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545263 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 99F56C433EF for ; Tue, 22 Feb 2022 23:43:30 +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 CF47C18BB; Wed, 23 Feb 2022 00:42:38 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CF47C18BB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573408; bh=Ov79U4TgPQ+gMDAWw14lQv/noTeCCug2XzBJ0Z4tL+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=vOiblvjQdSLvFDzdnLHedyQFJ2h6aW2ktKqXIPIj++T+f9/ew5KKcRcHIU22GaZPg HLbpCRJEU4UPqg2gQo2Bt4ypfPQuE1sFSNTMKy951Qm9ESvMO3tYPW17TgJcb05dsi dVYdfQhTd0Ui+wQXHIPByOolB6XHjMsLDSI3aVMs= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 251EDF8052F; Wed, 23 Feb 2022 00:40:49 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 0D26AF8051F; Wed, 23 Feb 2022 00:40:47 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2F16FF80511 for ; Wed, 23 Feb 2022 00:40:44 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2F16FF80511 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tVBgTdp2" 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 DCD8D61136; Tue, 22 Feb 2022 23:40:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A48E3C340E8; Tue, 22 Feb 2022 23:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573242; bh=Ov79U4TgPQ+gMDAWw14lQv/noTeCCug2XzBJ0Z4tL+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tVBgTdp2ouda7n6GYNmALdjgSx4jiyjnZz9y+sf4Ix9Qead8RFXZquPfoN5GVAOid 0TNb+V56YmQwjZJxk/iTFLPvVe0DNZ/cnSrVweSclo7Co3lGWHZUlNKp9BrttAOmXQ RNvRZkNjntZslRLYs6wVOwz7f2Mfvs7vPgNIuZ5Tue8hUGwDyLLpXfK3Qifw3GY3Hp v+qay050HY5J2Ble5PEHKfp2KA3IWeU4cTsFmoKNQKbEfZ+ksllVWKOMjOojswI3YV 4UfEgwfEnYDP/HCvOu16YL9ntQeJ6qvlah2XM1FO10uvhBvMlh7NoU7CUtNbBu7AVa 7vknKQ8fW6DWg== From: Mark Brown To: Liam Girdwood Subject: [PATCH 08/10] ASoC: max98925: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:24 +0000 Message-Id: <20220222234026.712070-8-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1547; h=from:subject; bh=Ov79U4TgPQ+gMDAWw14lQv/noTeCCug2XzBJ0Z4tL+s=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQqsYEU5fi1MIHd1r0YJBv1Kvthd9GrL7UDi0Jn FEas/8CJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KgAKCRAk1otyXVSH0OV/B/ 0cRVCcSEiKMVSQDx7J063UIzTTOmztr8ET8CyKipkxC1BhrhFQ/d2z7I25mQ9rzktK2VwVs0gUCuag s7FPhtkzEhB7x9ESLtxhGsHrGczN0GFLZR6NWWRgi/NCuYATb+U4cgl/LszrHQ5a7qHaVDFriotZjM DUzsSoXf37/2WCU0eHICN8+E5UXuBYBlQ9VDqFjUUlSRUin1N0t6XxkuSktj/pGbnq+UKMrtDX5TGq +WlqTlHWq+HUMRM7q86XS1eifgI89X3VZki1wiz/TbHIUgMg32U+Ni6wCtgJbDjdGr5nKNczrRycn2 7OWtjPP8pu/BjciYUgznHVO40/cX4M X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98925 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98925.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index ddaccc24b0cb..f34fa274ae4f 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -300,25 +300,22 @@ static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int invert = 0; dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* set DAI to slave mode */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBC_CFC: regmap_update_bits(max98925->regmap, MAX98925_DAI_CLK_MODE2, M98925_DAI_MAS_MASK, 0); max98925_set_sense_data(max98925); break; - case SND_SOC_DAIFMT_CBM_CFM: + case SND_SOC_DAIFMT_CBP_CFP: /* - * set left channel DAI to master mode, - * right channel always slave + * set left channel DAI to provider mode, + * right channel always consumer */ regmap_update_bits(max98925->regmap, MAX98925_DAI_CLK_MODE2, M98925_DAI_MAS_MASK, M98925_DAI_MAS_MASK); 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 Tue Feb 22 23:40:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545052 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 38D2FC433EF for ; Tue, 22 Feb 2022 23:44:21 +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 4E61B18CE; Wed, 23 Feb 2022 00:43:29 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 4E61B18CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573459; bh=iCszTHGxpI51noI6M65U/9xAqXAzUJaAtrgHe0XlHyc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kWthKtX356KZF0UQizvah7uhR+QlqMT2e4vVXGzoK1IsPHM7kSr8I9xlzhSni0+Pt KXEh1QaO5EGdmMXuaugPGC8Un+4jX0yV+4K1eyzbtLu3MH/BKOMVfli5a3KQ9HzNqH 3QvO173HGOgNknZ+uPnJP/xBHEf7EsrSWLf3RPpE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3C17DF8053C; Wed, 23 Feb 2022 00:40:55 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 52041F80539; Wed, 23 Feb 2022 00:40:53 +0100 (CET) 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 073B1F8052D for ; Wed, 23 Feb 2022 00:40:46 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 073B1F8052D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gw5QxmSX" 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 C1BE461137; Tue, 22 Feb 2022 23:40:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 299D3C340F0; Tue, 22 Feb 2022 23:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573244; bh=iCszTHGxpI51noI6M65U/9xAqXAzUJaAtrgHe0XlHyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gw5QxmSX9gpwi5nRpV+7esKAgO5bwkFJ70RwbUyk/PIza8ksuzbtfysrbQkq5+yvm bbRRX4kzgdhp2FFFHzx8Sku7RB7RYB8xOBvQqhSfeQBc44/AEz5zzMq/Pt2ER2FwG8 TY53O9wYJfwSqCVt1X6ucWCduQeyPZ9ysV7k2EIx/743LrZFq2hHRqxacOkjQRGYAm 2Xmiqwgd15WVll4YE+q0J6JbjMjnaYHUXu88rmLatmZJtb5RH9QdozBEsHiVN52e2H eQISZHR8X13158yBbjDuQoAj5ZRIoNtr/RHdnxJwXoLYVMzhb/FJlKdtPxtf/Ehq8G wOA/nfaMvTS6Q== From: Mark Brown To: Liam Girdwood Subject: [PATCH 09/10] ASoC: max98926: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:25 +0000 Message-Id: <20220222234026.712070-9-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=866; h=from:subject; bh=iCszTHGxpI51noI6M65U/9xAqXAzUJaAtrgHe0XlHyc=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQruZ/7v4W29QhAIf9Y/Vdp2my3jdUV6Xhh2yE4 kL9nO4KJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0KwAKCRAk1otyXVSH0AIxB/ 47kJ86G7wuaAsrHc1BZZ2Fh/A4wB3/MzR20EQxs92UYlMz+a71A03qniczKGNAie338RJ4PMf2XSKP 4nHoMIY58xXZo/ASVOzqbiMOa8a/0rrjvKQgwthMWbaxPKYdZ9+raeQIFABwxwGk6gkm5n0Lp80JBt T35cGe4952uPcUEwn/FQXm9YDyWaMLVlT1VeFMyapD48MYWQrZ4iIJcLNmo8odeTvAVBDMuvZyNSxq bkz9cJXqaEemmUBNvUh2BTm+o1LHWTQx8aLTEDZYCRa4ApA44Upb9nivLw8+kfAXR+sCkRA8AqpKId LxTh6RJR8hyUW77+1PSd9tgVw4MDsI X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98926 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98926.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index f286e572263e..1fbbc62bb0a2 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -331,8 +331,8 @@ static int max98926_dai_set_fmt(struct snd_soc_dai *codec_dai, dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); - 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: max98926_set_sense_data(max98926); break; default: From patchwork Tue Feb 22 23:40:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 545262 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 C2B06C433EF for ; Tue, 22 Feb 2022 23:44: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 0DBB918B1; Wed, 23 Feb 2022 00:43:11 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0DBB918B1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1645573441; bh=9w/GiS24uie492Fc9eeqIvYAbmBxWWrK3xRh3ax/B3M=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=kVgeQZY75aQKvc2LFibvdBFjHK3OhYr0oX8hQogq9o9tIiA1bMsHn/EsgqXYu+fJ0 s0zBJUtLrvXrYbXKJv8ohuSHMPeh3rEQEZUkKLqMn0UfMaqjllMtqW2VNiF7ikRgm/ HWVbWd0VwrUBQLAKjhzseuL6K+/Gaa5e6ZQufw3c= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id B0504F80536; Wed, 23 Feb 2022 00:40:54 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D0394F8053A; Wed, 23 Feb 2022 00:40:50 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C68BDF80528 for ; Wed, 23 Feb 2022 00:40:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C68BDF80528 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G4rLWjHd" 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 4D4F360DE0; Tue, 22 Feb 2022 23:40:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A20DEC340F4; Tue, 22 Feb 2022 23:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645573245; bh=9w/GiS24uie492Fc9eeqIvYAbmBxWWrK3xRh3ax/B3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G4rLWjHdsk5JqHwVx+Mo1+ORohk+eD44msu063TMvHchRTTfuf78PLXcHGeaWR7Hd GGIcp4LbUw0HG9xixCTLjKme41WcNRbtZ7aLcqpu/10jLK0Vk0fyM/ezbVxHIgp9/G fUG8Ns3tTGGP0EUJSGJYcemaBO6zkVMBeaJx9NaDxx3THhfUoojVgJLB9s4eaKZeXY v41n5dF+PxYhzW3L5TRwBN3xs8vIumKzKGtNrb1BF/y0nHvAdkBKaCFqaNJZODAy40 yVcbxusur4NEi5N/3bBMsB98MRfkDg9nO+6fuY34RKKZ7x36Bom61iEo2VkWxw+Wao 3lJvpeX5VH9Iw== From: Mark Brown To: Liam Girdwood Subject: [PATCH 10/10] ASoC: max98927: Use modern ASoC DAI format terminology Date: Tue, 22 Feb 2022 23:40:26 +0000 Message-Id: <20220222234026.712070-10-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220222234026.712070-1-broonie@kernel.org> References: <20220222234026.712070-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1872; h=from:subject; bh=9w/GiS24uie492Fc9eeqIvYAbmBxWWrK3xRh3ax/B3M=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiFXQsXBHFyoNldem+KXSn4BxljnmNS27UHdTilA25 uqIDRSmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYhV0LAAKCRAk1otyXVSH0H+OB/ 9wOWdJK73piBfI+Nth0n6nUZFbKd7M6hIgkGORbdNfPOG8OmVzt6sRAuupxfEoTDUZ1j/3DuLGkYB1 hHuDTtklCcX3/quIPzqeLuynOzl2+7adk5+3bpv+jLiDtFZlqDT0zIDR2cgeVZB6mCh6OsAkVMTFWF WASw//yM03pSqwnlj6+VT9yw5FvoFDvvHmobJkWIa1gHjz0qvce8DPtBPWYahfCJ+70nvxCSnbmqb3 wHyjRNYuxIweNSqVa3wVAeJXS3j2LnawlwxCMP52goW1+2zaw6nqjkgaqyjkB9IEoGJuvdSI+CeA3j dJ2TKvJqJG5gNOi3HQNWCZyJRoHvVR X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Cc: alsa-devel@alsa-project.org, Mark Brown , Peter Rosin 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 max98927 driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/codecs/max98927.c | 11 ++++++----- sound/soc/codecs/max98927.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index fd84780bf689..bf78d3c98514 100644 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -148,12 +148,13 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); - 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: + max98927->provider = false; mode = MAX98927_PCM_MASTER_MODE_SLAVE; break; - case SND_SOC_DAIFMT_CBM_CFM: - max98927->master = true; + case SND_SOC_DAIFMT_CBP_CFP: + max98927->provider = true; mode = MAX98927_PCM_MASTER_MODE_MASTER; break; default: @@ -270,7 +271,7 @@ static int max98927_set_clock(struct max98927_priv *max98927, int blr_clk_ratio = params_channels(params) * max98927->ch_size; int value; - if (max98927->master) { + if (max98927->provider) { int i; /* match rate to closest value */ for (i = 0; i < ARRAY_SIZE(rate_table); i++) { diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h index 13f5066d7419..2353910f5f17 100644 --- a/sound/soc/codecs/max98927.h +++ b/sound/soc/codecs/max98927.h @@ -264,7 +264,7 @@ struct max98927_priv { unsigned int ch_size; unsigned int rate; unsigned int iface; - unsigned int master; + unsigned int provider; unsigned int digital_gain; bool tdm_mode; };