| Message ID | 1597047103-6863-1-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a8fd5ca8016948a611bff62b0990ade9e1f8e83c |
| Headers | show |
| Series | [v2] ASoC: fsl-asoc-card: Get "extal" clock rate by clk_get_rate | expand |
On Mon, Aug 10, 2020 at 04:11:43PM +0800, Shengjiu Wang wrote: > On some platform(.e.g. i.MX8QM MEK), the "extal" clock is different > with the mclk of codec, then the clock rate is also different. > So it is better to get clock rate of "extal" rate by clk_get_rate, > don't reuse the clock rate of mclk. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > --- > changes in v2 > - add defer probe handler > > sound/soc/fsl/fsl-asoc-card.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c > index 52adedc03245..32f8f756e6bb 100644 > --- a/sound/soc/fsl/fsl-asoc-card.c > +++ b/sound/soc/fsl/fsl-asoc-card.c > @@ -696,6 +696,17 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) > goto asrc_fail; > } > } else if (of_node_name_eq(cpu_np, "esai")) { > + struct clk *esai_clk = clk_get(&cpu_pdev->dev, "extal"); > + > + if (!IS_ERR(esai_clk)) { > + priv->cpu_priv.sysclk_freq[TX] = clk_get_rate(esai_clk); > + priv->cpu_priv.sysclk_freq[RX] = clk_get_rate(esai_clk); Will it break existing imx-audio-cs42888 on older i.MX platforms? 'cause it overwrites cpu_priv.sysclk_freq[] that are set in "card configurations" section.
On Mon, Aug 10, 2020 at 4:39 PM Nicolin Chen <nicoleotsuka@gmail.com> wrote: > > On Mon, Aug 10, 2020 at 04:11:43PM +0800, Shengjiu Wang wrote: > > On some platform(.e.g. i.MX8QM MEK), the "extal" clock is different > > with the mclk of codec, then the clock rate is also different. > > So it is better to get clock rate of "extal" rate by clk_get_rate, > > don't reuse the clock rate of mclk. > > > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> > > --- > > changes in v2 > > - add defer probe handler > > > > sound/soc/fsl/fsl-asoc-card.c | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c > > index 52adedc03245..32f8f756e6bb 100644 > > --- a/sound/soc/fsl/fsl-asoc-card.c > > +++ b/sound/soc/fsl/fsl-asoc-card.c > > @@ -696,6 +696,17 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) > > goto asrc_fail; > > } > > } else if (of_node_name_eq(cpu_np, "esai")) { > > + struct clk *esai_clk = clk_get(&cpu_pdev->dev, "extal"); > > + > > + if (!IS_ERR(esai_clk)) { > > + priv->cpu_priv.sysclk_freq[TX] = clk_get_rate(esai_clk); > > + priv->cpu_priv.sysclk_freq[RX] = clk_get_rate(esai_clk); > > Will it break existing imx-audio-cs42888 on older i.MX platforms? > 'cause it overwrites cpu_priv.sysclk_freq[] that are set in "card > configurations" section. Tested, no break for imx6. best regards wang shengjiu
On Mon, Aug 10, 2020 at 04:11:43PM +0800, Shengjiu Wang wrote: > On some platform(.e.g. i.MX8QM MEK), the "extal" clock is different > with the mclk of codec, then the clock rate is also different. > So it is better to get clock rate of "extal" rate by clk_get_rate, > don't reuse the clock rate of mclk. > > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
On Mon, 10 Aug 2020 16:11:43 +0800, Shengjiu Wang wrote: > On some platform(.e.g. i.MX8QM MEK), the "extal" clock is different > with the mclk of codec, then the clock rate is also different. > So it is better to get clock rate of "extal" rate by clk_get_rate, > don't reuse the clock rate of mclk. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl-asoc-card: Get "extal" clock rate by clk_get_rate commit: a8fd5ca8016948a611bff62b0990ade9e1f8e83c All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 52adedc03245..32f8f756e6bb 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -696,6 +696,17 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) goto asrc_fail; } } else if (of_node_name_eq(cpu_np, "esai")) { + struct clk *esai_clk = clk_get(&cpu_pdev->dev, "extal"); + + if (!IS_ERR(esai_clk)) { + priv->cpu_priv.sysclk_freq[TX] = clk_get_rate(esai_clk); + priv->cpu_priv.sysclk_freq[RX] = clk_get_rate(esai_clk); + clk_put(esai_clk); + } else if (PTR_ERR(esai_clk) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto asrc_fail; + } + priv->cpu_priv.sysclk_id[1] = ESAI_HCKT_EXTAL; priv->cpu_priv.sysclk_id[0] = ESAI_HCKR_EXTAL; } else if (of_node_name_eq(cpu_np, "sai")) {
On some platform(.e.g. i.MX8QM MEK), the "extal" clock is different with the mclk of codec, then the clock rate is also different. So it is better to get clock rate of "extal" rate by clk_get_rate, don't reuse the clock rate of mclk. Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> --- changes in v2 - add defer probe handler sound/soc/fsl/fsl-asoc-card.c | 11 +++++++++++ 1 file changed, 11 insertions(+)