From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 764FFC433FE for ; Tue, 21 Sep 2021 21:14:20 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED1BA60F70 for ; Tue, 21 Sep 2021 21:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ED1BA60F70 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8CD721660; Tue, 21 Sep 2021 23:13:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8CD721660 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1632258858; bh=uMj9Yoh6CUT/R5lukGLiO6qATz85EOJ3O0N05idRBV8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=e/kHZH086d68qgSHVxAhk472ltAb8i93sUcuG5BeHB3AeDxUqRCqDKFgFNwI2zH18 t62qEZ1njxrOaWxXfzuqZ3ItgoOkDGs9TUoo8S5klq26UOnBbOUV3gqAmqsj+UPlFA wc8LizEHB5Z/mNzU1VxWt/i1feywvynDqb5VFDD0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A1BA5F804F2; Tue, 21 Sep 2021 23:11:49 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9A138F804E5; Tue, 21 Sep 2021 23:11:39 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id D8213F804BD for ; Tue, 21 Sep 2021 23:11:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz D8213F804BD Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iXqT+IAt" Received: by mail.kernel.org (Postfix) with ESMTPSA id E86EC611ED; Tue, 21 Sep 2021 21:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632258693; bh=uMj9Yoh6CUT/R5lukGLiO6qATz85EOJ3O0N05idRBV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXqT+IAtGkrCho4UxNz9uo9kBpoS+x/fnt87c/O+dw1lQe4ZgouAAcMMLW/jJao+u 6pgw6nR3xq/HVhFVt/8P5MQY4CH8O8c+iD4eEo9G+LL+b8/RNJZpa1i9yWeUaiIXj0 ym/y6Qj4CrpAsHNYqPw0y8pNVFOBHB56cxbR7i9bTFrEZI70nWaY6f5vvGFw7/4OCL O6Daz4jIL/nOuwM3LAGDMzpqqCkgBAPnRWWNntWPL8Qa1pFBJy8eGpC7brPL2gEeWC QAZKrE7wL9oMs+bcgExZqjhxBZWqCIg8v45w3dl3Aqj9Ra3GbipMtc+xGQGZdelKFu 9V30AuMalSrIw== From: Mark Brown To: Liam Girdwood , Nicolin Chen , Xiubo Li , Fabio Estevam , Shengjiu Wang Subject: [PATCH 04/16] ASoC: fsl-esai: Update to modern clocking terminology Date: Tue, 21 Sep 2021 22:10:28 +0100 Message-Id: <20210921211040.11624-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210921211040.11624-1-broonie@kernel.org> References: <20210921211040.11624-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2755; h=from:subject; bh=uMj9Yoh6CUT/R5lukGLiO6qATz85EOJ3O0N05idRBV8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhSkne5GCkDdvG7GRD8CbzywYtb1V7yAJYV3zbSkaL E0KV0yeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUpJ3gAKCRAk1otyXVSH0ELoB/ sFr+4hZRzKxLggMstacDfkKzLsc8tu3ohruU7tphL9l+roP/c24undQnXDjg3uzVJC7R70e3y6FGa3 b/q2zs1135vqvwoIkZw9Bic4g4DkUccJA6TzCS0mYO0zh0txe4DGB5x/71u6zZannbiUWkyQseAQTM S9a5rhj1X2CahDIiU8V3eRqejCDqvog4/n2BIwK7aUfefq/F72P9KAcburoQiLw1eRsuxG1VeuOCm1 OZSFTqo/Mmj/61PgR+f7wSewi3VuZEmIKl0bNvNnfM+uZKTCNlYhitjhrZ8R9JX5FvElz4cuvalLiL f8DioxoFo5Hq7YDXmvwvLsKmDk7CTw X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Content-Transfer-Encoding: 8bit Cc: alsa-devel@alsa-project.org, Mark Brown , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org 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 fsl-esai driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_esai.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index bda66b30e063..3a9e2df4e16f 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -52,7 +52,7 @@ struct fsl_esai_soc_data { * @sck_rate: clock rate of desired SCKx clock * @hck_dir: the direction of HCKx pads * @sck_div: if using PSR/PM dividers for SCKx clock - * @slave_mode: if fully using DAI slave mode + * @consumer_mode: if fully using DAI clock consumer mode * @synchronous: if using tx/rx synchronous mode * @name: driver name */ @@ -78,7 +78,7 @@ struct fsl_esai { u32 sck_rate[2]; bool hck_dir[2]; bool sck_div[2]; - bool slave_mode; + bool consumer_mode; bool synchronous; char name[32]; }; @@ -366,8 +366,8 @@ static int fsl_esai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) u32 sub, ratio = hck_rate / freq; int ret; - /* Don't apply for fully slave mode or unchanged bclk */ - if (esai_priv->slave_mode || esai_priv->sck_rate[tx] == freq) + /* Don't apply for fully consumer mode or unchanged bclk */ + if (esai_priv->consumer_mode || esai_priv->sck_rate[tx] == freq) return 0; if (ratio * freq > hck_rate) @@ -476,20 +476,20 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - esai_priv->slave_mode = false; + esai_priv->consumer_mode = false; - /* DAI clock master masks */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - esai_priv->slave_mode = true; + /* DAI clock provider masks */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + esai_priv->consumer_mode = true; break; - case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBC_CFP: xccr |= ESAI_xCCR_xCKD; break; - case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBP_CFC: xccr |= ESAI_xCCR_xFSD; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: xccr |= ESAI_xCCR_xFSD | ESAI_xCCR_xCKD; break; default: @@ -1016,8 +1016,8 @@ static int fsl_esai_probe(struct platform_device *pdev) /* Set a default slot number */ esai_priv->slots = 2; - /* Set a default master/slave state */ - esai_priv->slave_mode = true; + /* Set a default clock provider state */ + esai_priv->consumer_mode = true; /* Determine the FIFO depth */ iprop = of_get_property(np, "fsl,fifo-depth", NULL); -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9446C433FE for ; Tue, 21 Sep 2021 21:15:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A4A3C61159 for ; Tue, 21 Sep 2021 21:15:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A4A3C61159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OXS7rq4omzmsuA3VlGh97LANLP8aLVJ5H7k1re4TCIA=; b=Xdqod/4JekGffg BpInoNvw+g1DEkwAavntcHcFrKYY/fIQoopha0xNyJevuTCLFEVh/qoZo4yjRRnZIxp41YJYLiMkH 67s2nayaBcWvC/+eB1k39P0/zxGUJwV1UEG+mSJDc2UcfcLEUq/0q/Cv/EOht71rF+q8kddx/Wfzh lijZ8yye0Iao5Rq2GS8XA8B9iX4tFQ9woSgWEDNdk/V+Ot0ZAAEMeZyxizxppO+q5LZj8TURGRimC ChzyNUYXUflceGdCggMU2lXta0S3hb5auMii7tU7Bjwnv35XcCkBGg9P6B6AJ5ktGiAHd4wGO7r5c 25PSUqvqm0JM8uz/VQWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSn45-005o5r-6P; Tue, 21 Sep 2021 21:12:33 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mSn37-005nhA-P1 for linux-arm-kernel@lists.infradead.org; Tue, 21 Sep 2021 21:11:35 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E86EC611ED; Tue, 21 Sep 2021 21:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1632258693; bh=uMj9Yoh6CUT/R5lukGLiO6qATz85EOJ3O0N05idRBV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iXqT+IAtGkrCho4UxNz9uo9kBpoS+x/fnt87c/O+dw1lQe4ZgouAAcMMLW/jJao+u 6pgw6nR3xq/HVhFVt/8P5MQY4CH8O8c+iD4eEo9G+LL+b8/RNJZpa1i9yWeUaiIXj0 ym/y6Qj4CrpAsHNYqPw0y8pNVFOBHB56cxbR7i9bTFrEZI70nWaY6f5vvGFw7/4OCL O6Daz4jIL/nOuwM3LAGDMzpqqCkgBAPnRWWNntWPL8Qa1pFBJy8eGpC7brPL2gEeWC QAZKrE7wL9oMs+bcgExZqjhxBZWqCIg8v45w3dl3Aqj9Ra3GbipMtc+xGQGZdelKFu 9V30AuMalSrIw== From: Mark Brown To: Liam Girdwood , Nicolin Chen , Xiubo Li , Fabio Estevam , Shengjiu Wang Cc: alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH 04/16] ASoC: fsl-esai: Update to modern clocking terminology Date: Tue, 21 Sep 2021 22:10:28 +0100 Message-Id: <20210921211040.11624-4-broonie@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210921211040.11624-1-broonie@kernel.org> References: <20210921211040.11624-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2755; h=from:subject; bh=uMj9Yoh6CUT/R5lukGLiO6qATz85EOJ3O0N05idRBV8=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBhSkne5GCkDdvG7GRD8CbzywYtb1V7yAJYV3zbSkaL E0KV0yeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYUpJ3gAKCRAk1otyXVSH0ELoB/ sFr+4hZRzKxLggMstacDfkKzLsc8tu3ohruU7tphL9l+roP/c24undQnXDjg3uzVJC7R70e3y6FGa3 b/q2zs1135vqvwoIkZw9Bic4g4DkUccJA6TzCS0mYO0zh0txe4DGB5x/71u6zZannbiUWkyQseAQTM S9a5rhj1X2CahDIiU8V3eRqejCDqvog4/n2BIwK7aUfefq/F72P9KAcburoQiLw1eRsuxG1VeuOCm1 OZSFTqo/Mmj/61PgR+f7wSewi3VuZEmIKl0bNvNnfM+uZKTCNlYhitjhrZ8R9JX5FvElz4cuvalLiL f8DioxoFo5Hq7YDXmvwvLsKmDk7CTw X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210921_141133_899239_58A6FEF6 X-CRM114-Status: GOOD ( 14.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As part of moving to remove the old style defines for the bus clocks update the fsl-esai driver to use more modern terminology for clocking. Signed-off-by: Mark Brown --- sound/soc/fsl/fsl_esai.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index bda66b30e063..3a9e2df4e16f 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -52,7 +52,7 @@ struct fsl_esai_soc_data { * @sck_rate: clock rate of desired SCKx clock * @hck_dir: the direction of HCKx pads * @sck_div: if using PSR/PM dividers for SCKx clock - * @slave_mode: if fully using DAI slave mode + * @consumer_mode: if fully using DAI clock consumer mode * @synchronous: if using tx/rx synchronous mode * @name: driver name */ @@ -78,7 +78,7 @@ struct fsl_esai { u32 sck_rate[2]; bool hck_dir[2]; bool sck_div[2]; - bool slave_mode; + bool consumer_mode; bool synchronous; char name[32]; }; @@ -366,8 +366,8 @@ static int fsl_esai_set_bclk(struct snd_soc_dai *dai, bool tx, u32 freq) u32 sub, ratio = hck_rate / freq; int ret; - /* Don't apply for fully slave mode or unchanged bclk */ - if (esai_priv->slave_mode || esai_priv->sck_rate[tx] == freq) + /* Don't apply for fully consumer mode or unchanged bclk */ + if (esai_priv->consumer_mode || esai_priv->sck_rate[tx] == freq) return 0; if (ratio * freq > hck_rate) @@ -476,20 +476,20 @@ static int fsl_esai_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - esai_priv->slave_mode = false; + esai_priv->consumer_mode = false; - /* DAI clock master masks */ - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBM_CFM: - esai_priv->slave_mode = true; + /* DAI clock provider masks */ + switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) { + case SND_SOC_DAIFMT_CBP_CFP: + esai_priv->consumer_mode = true; break; - case SND_SOC_DAIFMT_CBS_CFM: + case SND_SOC_DAIFMT_CBC_CFP: xccr |= ESAI_xCCR_xCKD; break; - case SND_SOC_DAIFMT_CBM_CFS: + case SND_SOC_DAIFMT_CBP_CFC: xccr |= ESAI_xCCR_xFSD; break; - case SND_SOC_DAIFMT_CBS_CFS: + case SND_SOC_DAIFMT_CBC_CFC: xccr |= ESAI_xCCR_xFSD | ESAI_xCCR_xCKD; break; default: @@ -1016,8 +1016,8 @@ static int fsl_esai_probe(struct platform_device *pdev) /* Set a default slot number */ esai_priv->slots = 2; - /* Set a default master/slave state */ - esai_priv->slave_mode = true; + /* Set a default clock provider state */ + esai_priv->consumer_mode = true; /* Determine the FIFO depth */ iprop = of_get_property(np, "fsl,fifo-depth", NULL); -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel