lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: meson: spdifin: start hw on dai probe

Browse Source 
[ Upstream commit aedf323b66b2b875137422ecb7d2525179759076 ]

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.

Fixes: 5ce5658375 ("ASoC: meson: add axg spdif input")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20230907090504.12700-1-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jerome Brunet 2023-09-07 11:05:04 +02:00 committed by Greg Kroah-Hartman
parent 0c908e1595
commit d2a6844be5
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
sound/soc/meson/axg-spdifin.c
View File

@ -112,34 +112,6 @@ static int axg_spdifin_prepare(struct snd_pcm_substream *substream,
return 0; 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, static void axg_spdifin_write_mode_param(struct regmap *map, int mode,
unsigned int val, unsigned int val,
unsigned int num_per_reg, unsigned int num_per_reg,
@ -251,25 +223,38 @@ static int axg_spdifin_dai_probe(struct snd_soc_dai *dai)
ret = axg_spdifin_sample_mode_config(dai, priv); ret = axg_spdifin_sample_mode_config(dai, priv);
if (ret) { if (ret) {
dev_err(dai->dev, "mode configuration failed\n"); dev_err(dai->dev, "mode configuration failed\n");
clk_disable_unprepare(priv->pclk); goto pclk_err;
return ret;
} }
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; return 0;
pclk_err:
clk_disable_unprepare(priv->pclk);
return ret;
} }
static int axg_spdifin_dai_remove(struct snd_soc_dai *dai) static int axg_spdifin_dai_remove(struct snd_soc_dai *dai)
{ {
struct axg_spdifin *priv = snd_soc_dai_get_drvdata(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); clk_disable_unprepare(priv->pclk);
return 0; return 0;
} }
static const struct snd_soc_dai_ops axg_spdifin_ops = { static const struct snd_soc_dai_ops axg_spdifin_ops = {
.prepare = axg_spdifin_prepare, .prepare = axg_spdifin_prepare,
.startup = axg_spdifin_startup,
.shutdown = axg_spdifin_shutdown,
}; };
static int axg_spdifin_iec958_info(struct snd_kcontrol *kcontrol, static int axg_spdifin_iec958_info(struct snd_kcontrol *kcontrol,