Commit 756ae8f2 authored by Yu-Hsuan Hsu's avatar Yu-Hsuan Hsu Committed by Mark Brown

ASoC: AMD: Enable clk in startup intead of hw_params

Some usages only call startup and shutdown without setting hw_params
(e.g. arecord --dump-hw-params). If we don't enable clk in startup, it
will cause ref count error because the clk will be disabled in shutdown.
For this reason, we should move enabling clk from hw_params to startup.

In addition, the hw_params is fixed in this driver(48000 rate, 2
channels, S16_LE format) so we don't need to change the clk rate after
the hw_params is set.
Signed-off-by: default avatarYu-Hsuan Hsu <yuhsuan@chromium.org>
Acked-by: default avatarAkshu Agrawal <akshu.agarawal@amd.com>
Link: https://lore.kernel.org/r/20191126075424.80668-1-yuhsuan@chromium.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc094709
...@@ -96,14 +96,19 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) ...@@ -96,14 +96,19 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd)
return 0; return 0;
} }
static int da7219_clk_enable(struct snd_pcm_substream *substream, static int da7219_clk_enable(struct snd_pcm_substream *substream)
int wclk_rate, int bclk_rate)
{ {
int ret = 0; int ret = 0;
struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data;
clk_set_rate(da7219_dai_wclk, wclk_rate); /*
clk_set_rate(da7219_dai_bclk, bclk_rate); * Set wclk to 48000 because the rate constraint of this driver is
* 48000. ADAU7002 spec: "The ADAU7002 requires a BCLK rate that is
* minimum of 64x the LRCLK sample rate." DA7219 is the only clk
* source so for all codecs we have to limit bclk to 64X lrclk.
*/
clk_set_rate(da7219_dai_wclk, 48000);
clk_set_rate(da7219_dai_bclk, 48000 * 64);
ret = clk_prepare_enable(da7219_dai_bclk); ret = clk_prepare_enable(da7219_dai_bclk);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't enable master clock %d\n", ret); dev_err(rtd->dev, "can't enable master clock %d\n", ret);
...@@ -156,7 +161,7 @@ static int cz_da7219_play_startup(struct snd_pcm_substream *substream) ...@@ -156,7 +161,7 @@ static int cz_da7219_play_startup(struct snd_pcm_substream *substream)
&constraints_rates); &constraints_rates);
machine->play_i2s_instance = I2S_SP_INSTANCE; machine->play_i2s_instance = I2S_SP_INSTANCE;
return 0; return da7219_clk_enable(substream);
} }
static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) static int cz_da7219_cap_startup(struct snd_pcm_substream *substream)
...@@ -178,7 +183,7 @@ static int cz_da7219_cap_startup(struct snd_pcm_substream *substream) ...@@ -178,7 +183,7 @@ static int cz_da7219_cap_startup(struct snd_pcm_substream *substream)
machine->cap_i2s_instance = I2S_SP_INSTANCE; machine->cap_i2s_instance = I2S_SP_INSTANCE;
machine->capture_channel = CAP_CHANNEL1; machine->capture_channel = CAP_CHANNEL1;
return 0; return da7219_clk_enable(substream);
} }
static int cz_max_startup(struct snd_pcm_substream *substream) static int cz_max_startup(struct snd_pcm_substream *substream)
...@@ -199,7 +204,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream) ...@@ -199,7 +204,7 @@ static int cz_max_startup(struct snd_pcm_substream *substream)
&constraints_rates); &constraints_rates);
machine->play_i2s_instance = I2S_BT_INSTANCE; machine->play_i2s_instance = I2S_BT_INSTANCE;
return 0; return da7219_clk_enable(substream);
} }
static int cz_dmic0_startup(struct snd_pcm_substream *substream) static int cz_dmic0_startup(struct snd_pcm_substream *substream)
...@@ -220,7 +225,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) ...@@ -220,7 +225,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream)
&constraints_rates); &constraints_rates);
machine->cap_i2s_instance = I2S_BT_INSTANCE; machine->cap_i2s_instance = I2S_BT_INSTANCE;
return 0; return da7219_clk_enable(substream);
} }
static int cz_dmic1_startup(struct snd_pcm_substream *substream) static int cz_dmic1_startup(struct snd_pcm_substream *substream)
...@@ -242,25 +247,7 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream) ...@@ -242,25 +247,7 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream)
machine->cap_i2s_instance = I2S_SP_INSTANCE; machine->cap_i2s_instance = I2S_SP_INSTANCE;
machine->capture_channel = CAP_CHANNEL0; machine->capture_channel = CAP_CHANNEL0;
return 0; return da7219_clk_enable(substream);
}
static int cz_da7219_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
int wclk, bclk;
wclk = params_rate(params);
bclk = wclk * params_channels(params) *
snd_pcm_format_width(params_format(params));
/* ADAU7002 spec: "The ADAU7002 requires a BCLK rate
* that is minimum of 64x the LRCLK sample rate."
* DA7219 is the only clk source so for all codecs
* we have to limit bclk to 64X lrclk.
*/
if (bclk < (wclk * 64))
bclk = wclk * 64;
return da7219_clk_enable(substream, wclk, bclk);
} }
static void cz_da7219_shutdown(struct snd_pcm_substream *substream) static void cz_da7219_shutdown(struct snd_pcm_substream *substream)
...@@ -271,31 +258,26 @@ static void cz_da7219_shutdown(struct snd_pcm_substream *substream) ...@@ -271,31 +258,26 @@ static void cz_da7219_shutdown(struct snd_pcm_substream *substream)
static const struct snd_soc_ops cz_da7219_play_ops = { static const struct snd_soc_ops cz_da7219_play_ops = {
.startup = cz_da7219_play_startup, .startup = cz_da7219_play_startup,
.shutdown = cz_da7219_shutdown, .shutdown = cz_da7219_shutdown,
.hw_params = cz_da7219_params,
}; };
static const struct snd_soc_ops cz_da7219_cap_ops = { static const struct snd_soc_ops cz_da7219_cap_ops = {
.startup = cz_da7219_cap_startup, .startup = cz_da7219_cap_startup,
.shutdown = cz_da7219_shutdown, .shutdown = cz_da7219_shutdown,
.hw_params = cz_da7219_params,
}; };
static const struct snd_soc_ops cz_max_play_ops = { static const struct snd_soc_ops cz_max_play_ops = {
.startup = cz_max_startup, .startup = cz_max_startup,
.shutdown = cz_da7219_shutdown, .shutdown = cz_da7219_shutdown,
.hw_params = cz_da7219_params,
}; };
static const struct snd_soc_ops cz_dmic0_cap_ops = { static const struct snd_soc_ops cz_dmic0_cap_ops = {
.startup = cz_dmic0_startup, .startup = cz_dmic0_startup,
.shutdown = cz_da7219_shutdown, .shutdown = cz_da7219_shutdown,
.hw_params = cz_da7219_params,
}; };
static const struct snd_soc_ops cz_dmic1_cap_ops = { static const struct snd_soc_ops cz_dmic1_cap_ops = {
.startup = cz_dmic1_startup, .startup = cz_dmic1_startup,
.shutdown = cz_da7219_shutdown, .shutdown = cz_da7219_shutdown,
.hw_params = cz_da7219_params,
}; };
SND_SOC_DAILINK_DEF(designware1, SND_SOC_DAILINK_DEF(designware1,
......
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