ASoC: meson: spdifin: start hw on dai probe
Jerome Brunet
maintainerPATCH 1/1 ASoC: meson: spdifin: start hw on dai probe
For spdif input to report the locked rate correctly, even when no capture is running, the HW and reference clock must be started as soon as the dai is probed.
--- sound/soc/meson/axg-spdifin.c | 49 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 32 deletions(-)
sound/soc/meson/axg-spdifin.c +17 -32
@@ -112,34 +112,6 @@ static int axg_spdifin_prepare(struct snd_pcm_substream *substream,return 0 ; } -static int axg_spdifin_startup (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); -int ret; - - ret =clk_prepare_enable (priv->refclk); -if (ret) { -dev_err (dai->dev, -"failed to enable spdifin reference clock\n" ); -return ret; - } - -regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN , -SPDIFIN_CTRL0_EN ); - -return 0 ; -} - -static void axg_spdifin_shutdown (struct snd_pcm_substream *substream, -struct snd_soc_dai *dai) -{ -struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); - -regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN ,0 ); -clk_disable_unprepare (priv->refclk); -} - static void axg_spdifin_write_mode_param(struct regmap *map, int mode, unsigned int val, unsigned int num_per_reg,
@@ -251,17 +223,32 @@ static int axg_spdifin_dai_probe(struct snd_soc_dai *dai) ret =axg_spdifin_sample_mode_config (dai, priv);if (ret) {dev_err (dai->dev,"mode configuration failed\n" ); -clk_disable_unprepare (priv->pclk); -return ret; + goto pclk_err; } + ret =clk_prepare_enable (priv->refclk); +if (ret) { +dev_err (dai->dev, +"failed to enable spdifin reference clock\n" ); + goto pclk_err; + } + +regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN , +SPDIFIN_CTRL0_EN ); +return 0 ; + +pclk_err: +clk_disable_unprepare (priv->pclk); +return ret; }static int axg_spdifin_dai_remove (struct snd_soc_dai *dai) {struct axg_spdifin *priv =snd_soc_dai_get_drvdata (dai); +regmap_update_bits (priv->map,SPDIFIN_CTRL0 ,SPDIFIN_CTRL0_EN ,0 ); +clk_disable_unprepare (priv->refclk);clk_disable_unprepare (priv->pclk);return 0 ; }
@@ -270,8 +257,6 @@ static const struct snd_soc_dai_ops axg_spdifin_ops = { .probe = axg_spdifin_dai_probe, .remove = axg_spdifin_dai_remove, .prepare = axg_spdifin_prepare, - .startup = axg_spdifin_startup, - .shutdown = axg_spdifin_shutdown, }; static int axg_spdifin_iec958_info(struct snd_kcontrol *kcontrol,
Signature · 7 lines
2.40.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Mark Brown
maintainerQuoted 5 lines · Jerome Brunet
For spdif input to report the locked rate correctly, even when no capture is running, the HW and reference clock must be started as soon as the dai is probed.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: meson: spdifin: start hw on dai probe
commit: aedf323b66b2b875137422ecb7d2525179759076
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
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic