Commit e9716ff3 authored by Akshu Agrawal's avatar Akshu Agrawal Committed by Mark Brown

ASoC: AMD: Move clk enable from hw_params/free to startup/shutdown

hw_param can be called multiple times and thus we can have
more clk enable. The clk may not get diabled due to refcounting.
startup/shutdown ensures single clk enable/disable call.
Signed-off-by: default avatarAkshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cac6f597
...@@ -91,8 +91,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) ...@@ -91,8 +91,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int cz_da7219_hw_params(struct snd_pcm_substream *substream, static int da7219_clk_enable(struct snd_pcm_substream *substream)
struct snd_pcm_hw_params *params)
{ {
int ret = 0; int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
...@@ -106,11 +105,9 @@ static int cz_da7219_hw_params(struct snd_pcm_substream *substream, ...@@ -106,11 +105,9 @@ static int cz_da7219_hw_params(struct snd_pcm_substream *substream,
return ret; return ret;
} }
static int cz_da7219_hw_free(struct snd_pcm_substream *substream) static void da7219_clk_disable(void)
{ {
clk_disable_unprepare(da7219_dai_clk); clk_disable_unprepare(da7219_dai_clk);
return 0;
} }
static const unsigned int channels[] = { static const unsigned int channels[] = {
...@@ -133,7 +130,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = { ...@@ -133,7 +130,7 @@ static const struct snd_pcm_hw_constraint_list constraints_channels = {
.mask = 0, .mask = 0,
}; };
static int cz_fe_startup(struct snd_pcm_substream *substream) static int cz_da7219_startup(struct snd_pcm_substream *substream)
{ {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
...@@ -147,23 +144,47 @@ static int cz_fe_startup(struct snd_pcm_substream *substream) ...@@ -147,23 +144,47 @@ static int cz_fe_startup(struct snd_pcm_substream *substream)
snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
&constraints_rates); &constraints_rates);
return 0; return da7219_clk_enable(substream);
}
static void cz_da7219_shutdown(struct snd_pcm_substream *substream)
{
da7219_clk_disable();
}
static int cz_max_startup(struct snd_pcm_substream *substream)
{
return da7219_clk_enable(substream);
}
static void cz_max_shutdown(struct snd_pcm_substream *substream)
{
da7219_clk_disable();
}
static int cz_dmic_startup(struct snd_pcm_substream *substream)
{
return da7219_clk_enable(substream);
}
static void cz_dmic_shutdown(struct snd_pcm_substream *substream)
{
da7219_clk_disable();
} }
static struct snd_soc_ops cz_da7219_cap_ops = { static struct snd_soc_ops cz_da7219_cap_ops = {
.hw_params = cz_da7219_hw_params, .startup = cz_da7219_startup,
.hw_free = cz_da7219_hw_free, .shutdown = cz_da7219_shutdown,
.startup = cz_fe_startup,
}; };
static struct snd_soc_ops cz_max_play_ops = { static struct snd_soc_ops cz_max_play_ops = {
.hw_params = cz_da7219_hw_params, .startup = cz_max_startup,
.hw_free = cz_da7219_hw_free, .shutdown = cz_max_shutdown,
}; };
static struct snd_soc_ops cz_dmic_cap_ops = { static struct snd_soc_ops cz_dmic_cap_ops = {
.hw_params = cz_da7219_hw_params, .startup = cz_dmic_startup,
.hw_free = cz_da7219_hw_free, .shutdown = cz_dmic_shutdown,
}; };
static struct snd_soc_dai_link cz_dai_7219_98357[] = { static struct snd_soc_dai_link cz_dai_7219_98357[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment