From: Sascha Hauer <s.hauer@pengutronix.de> To: alsa-devel@alsa-project.org Cc: Xiubo Li <Xiubo.Lee@gmail.com>, Fabio Estevam <festevam@gmail.com>, Shengjiu Wang <shengjiu.wang@gmail.com>, kernel@pengutronix.de, Vinod Koul <vkoul@kernel.org>, NXP Linux Team <linux-imx@nxp.com>, dmaengine@vger.kernel.org, Sascha Hauer <s.hauer@pengutronix.de> Subject: [PATCH v4 03/21] ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() Date: Thu, 7 Apr 2022 10:49:18 +0200 [thread overview] Message-ID: <20220407084936.223075-4-s.hauer@pengutronix.de> (raw) In-Reply-To: <20220407084936.223075-1-s.hauer@pengutronix.de> All that the .set_sysclk hook in the micfil driver does is to pass the sysclk frequency to fsl_micfil_set_mclk_rate(). This function expects the sample rate as argument though, not any kind of sysclk frequency. The resulting rate setting of the clock is overwritten in hw_params anyway, so drop this altogether. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> --- sound/soc/fsl/fsl_micfil.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index cf10c212d770d..5353474d0ff2b 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -358,30 +358,10 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, return 0; } -static int fsl_micfil_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, - unsigned int freq, int dir) -{ - struct fsl_micfil *micfil = snd_soc_dai_get_drvdata(dai); - struct device *dev = &micfil->pdev->dev; - - int ret; - - if (!freq) - return 0; - - ret = fsl_micfil_set_mclk_rate(micfil, freq); - if (ret < 0) - dev_err(dev, "failed to set mclk[%lu] to rate %u\n", - clk_get_rate(micfil->mclk), freq); - - return ret; -} - static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { .startup = fsl_micfil_startup, .trigger = fsl_micfil_trigger, .hw_params = fsl_micfil_hw_params, - .set_sysclk = fsl_micfil_set_dai_sysclk, }; static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Sascha Hauer <s.hauer@pengutronix.de> To: alsa-devel@alsa-project.org Cc: Xiubo Li <Xiubo.Lee@gmail.com>, Fabio Estevam <festevam@gmail.com>, Sascha Hauer <s.hauer@pengutronix.de>, Vinod Koul <vkoul@kernel.org>, NXP Linux Team <linux-imx@nxp.com>, kernel@pengutronix.de, dmaengine@vger.kernel.org, Shengjiu Wang <shengjiu.wang@gmail.com> Subject: [PATCH v4 03/21] ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() Date: Thu, 7 Apr 2022 10:49:18 +0200 [thread overview] Message-ID: <20220407084936.223075-4-s.hauer@pengutronix.de> (raw) In-Reply-To: <20220407084936.223075-1-s.hauer@pengutronix.de> All that the .set_sysclk hook in the micfil driver does is to pass the sysclk frequency to fsl_micfil_set_mclk_rate(). This function expects the sample rate as argument though, not any kind of sysclk frequency. The resulting rate setting of the clock is overwritten in hw_params anyway, so drop this altogether. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> --- sound/soc/fsl/fsl_micfil.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index cf10c212d770d..5353474d0ff2b 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -358,30 +358,10 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, return 0; } -static int fsl_micfil_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, - unsigned int freq, int dir) -{ - struct fsl_micfil *micfil = snd_soc_dai_get_drvdata(dai); - struct device *dev = &micfil->pdev->dev; - - int ret; - - if (!freq) - return 0; - - ret = fsl_micfil_set_mclk_rate(micfil, freq); - if (ret < 0) - dev_err(dev, "failed to set mclk[%lu] to rate %u\n", - clk_get_rate(micfil->mclk), freq); - - return ret; -} - static const struct snd_soc_dai_ops fsl_micfil_dai_ops = { .startup = fsl_micfil_startup, .trigger = fsl_micfil_trigger, .hw_params = fsl_micfil_hw_params, - .set_sysclk = fsl_micfil_set_dai_sysclk, }; static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) -- 2.30.2
next prev parent reply other threads:[~2022-04-07 8:50 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-07 8:49 [PATCH v4 00/21] ASoC: fsl_micfil: Driver updates Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 01/21] ASoC: fsl_micfil: Drop unnecessary register read Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 02/21] ASoC: fsl_micfil: Drop unused " Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer [this message] 2022-04-07 8:49 ` [PATCH v4 03/21] ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 04/21] ASoC: fsl_micfil: do not define SHIFT/MASK for single bits Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 05/21] ASoC: fsl_micfil: use GENMASK to define register bit fields Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:07 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 06/21] ASoC: fsl_micfil: use clear/set bits Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:08 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 07/21] ASoC: fsl_micfil: drop error messages from failed register accesses Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 08/21] ASoC: fsl_micfil: drop unused variables Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:09 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 09/21] dmaengine: imx: Move header to include/dma/ Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 10/21] dmaengine: imx-sdma: error out on unsupported transfer types Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 11/21] dmaengine: imx-sdma: Add multi fifo support Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 12/21] ASoC: fsl_micfil: add " Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:12 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 13/21] ASoC: fsl_micfil: use define for OSR default value Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:13 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 14/21] ASoC: fsl_micfil: Drop get_pdm_clk() Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:17 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 15/21] ASoC: fsl_micfil: simplify clock setting Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:18 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 16/21] ASoC: fsl_micfil: rework quality setting Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:20 ` Shengjiu Wang 2022-04-07 8:49 ` [PATCH v4 17/21] ASoC: fsl_micfil: drop unused include Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 18/21] ASoC: fsl_micfil: drop only once used defines Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 19/21] ASoC: fsl_micfil: drop support for undocumented property Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 20/21] ASoC: fsl_micfil: fold fsl_set_clock_params() into its only user Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-07 8:49 ` [PATCH v4 21/21] ASoC: fsl_micfil: Remove debug message Sascha Hauer 2022-04-07 8:49 ` Sascha Hauer 2022-04-08 5:21 ` Shengjiu Wang 2022-04-08 6:40 ` Sascha Hauer 2022-04-08 6:40 ` Sascha Hauer 2022-04-08 7:12 ` Shengjiu Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220407084936.223075-4-s.hauer@pengutronix.de \ --to=s.hauer@pengutronix.de \ --cc=Xiubo.Lee@gmail.com \ --cc=alsa-devel@alsa-project.org \ --cc=dmaengine@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-imx@nxp.com \ --cc=shengjiu.wang@gmail.com \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.