github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: soc-dai: add snd_soc_dai_get_bclk[_ratio]()

Browse Source 
DAI parameter will be capsuled soon, will be not enable to access from
each drivers. Add snd_soc_dai_get_bclk[_ratio]() for internal use.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Alvin Šipraga <alvin.sipraga@analog.com>
Link: https://patch.msgid.link/87ecerjprk.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2026-09-18 01:45:51 +00:00 committed by Mark Brown
parent 9ec8ccc97d
commit d47f591c9a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/soc-dai.c
View File

@ -1391,3 +1391,13 @@ void snd_soc_dai_symmetric_update(struct snd_pcm_substream *substream)
if (symmetry)
substream->runtime->hw.info |= SNDRV_PCM_INFO_JOINT_DUPLEX;
}
struct clk *snd_soc_dai_get_bclk(struct snd_soc_dai *dai)
{
return dai->bclk;
}
unsigned int snd_soc_dai_get_bclk_ratio(struct snd_soc_dai *dai)
{
return dai->bclk_ratio;
}

2
sound/soc/soc-internal.h
View File

@ -32,5 +32,7 @@ void snd_soc_dai_symmetric_set_params(struct snd_soc_dai *dai,
int snd_soc_dai_symmetric_apply(struct snd_pcm_substream *substream, struct snd_soc_dai *dai);
int snd_soc_dai_symmetric_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params);
void snd_soc_dai_symmetric_update(struct snd_pcm_substream *substream);
struct clk *snd_soc_dai_get_bclk(struct snd_soc_dai *dai);
unsigned int snd_soc_dai_get_bclk_ratio(struct snd_soc_dai *dai);
#endif /* __SOC_INTERNAL_H */

19
sound/soc/soc-pcm.c
View File

@ -445,17 +445,24 @@ static int soc_pcm_shared_bclk_rule_rate(struct snd_pcm_hw_params *params,
struct snd_interval *rate = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE);
struct snd_interval constraint = { .empty = 1 };
unsigned int target_rate;
struct clk *dai_bclk;
unsigned int dai_bclk_ratio;
int i;
/* Protect the rtd list traversal with the ASoC card mutex helper. */
guard(snd_soc_card_mutex)(card);
dai_bclk = snd_soc_dai_get_bclk(dai);
dai_bclk_ratio = snd_soc_dai_get_bclk_ratio(dai);
/* Scan all DAIs on the card for an active peer sharing the same BCLK */
for_each_card_rtds(card, rtd) {
for_each_rtd_cpu_dais(rtd, i, other_dai) {
struct clk *other_dai_bclk = snd_soc_dai_get_bclk(other_dai);
if (other_dai == dai)
continue;
if (!other_dai->bclk)
if (!other_dai_bclk)
continue;
if (!snd_soc_dai_active(other_dai))
continue;
@ -467,10 +474,10 @@ static int soc_pcm_shared_bclk_rule_rate(struct snd_pcm_hw_params *params,
*/
if (!other_dai->symmetric_rate)
continue;
if (!clk_is_match(dai->bclk, other_dai->bclk))
if (!clk_is_match(dai_bclk, other_dai_bclk))
continue;
active_bclk_rate = clk_get_rate(other_dai->bclk);
active_bclk_rate = clk_get_rate(other_dai_bclk);
if (active_bclk_rate)
goto found;
}
@ -479,13 +486,13 @@ static int soc_pcm_shared_bclk_rule_rate(struct snd_pcm_hw_params *params,
return 0;
found:
if (dai->bclk_ratio) {
if (dai_bclk_ratio) {
/*
* Driver has set an explicit BCLK ratio (e.g. for TDM where
* BCLK = rate * slots * slot_width). The only valid rate is
* active_bclk_rate / bclk_ratio.
*/
target_rate = active_bclk_rate / dai->bclk_ratio;
target_rate = active_bclk_rate / dai_bclk_ratio;
constraint.min = target_rate;
constraint.max = target_rate;
@ -522,7 +529,7 @@ static int soc_pcm_shared_bclk_rule_rate(struct snd_pcm_hw_params *params,
static int soc_pcm_apply_shared_bclk(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
if (!dai->bclk)
if (!snd_soc_dai_get_bclk(dai))
return 0;
dev_dbg(dai->dev,