Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1c59c87 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next

parents 80ca3186 e54cf76b

include/sound/soc-dai.h

+3 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, 
int snd_soc_dai_set_pll(struct snd_soc_dai *dai,

	int pll_id, int source, unsigned int freq_in, unsigned int freq_out);



int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio);



/* Digital Audio interface formatting */

int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
@@ -131,6 +133,7 @@ struct snd_soc_dai_ops { 
	int (*set_pll)(struct snd_soc_dai *dai, int pll_id, int source,

		unsigned int freq_in, unsigned int freq_out);

	int (*set_clkdiv)(struct snd_soc_dai *dai, int div_id, int div);

	int (*set_bclk_ratio)(struct snd_soc_dai *dai, unsigned int ratio);



	/*

	 * DAI format configuration

sound/soc/soc-core.c

+16 −0
Original line number Diff line number Diff line
@@ -3575,6 +3575,22 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
}

EXPORT_SYMBOL_GPL(snd_soc_codec_set_pll);



/**

 * snd_soc_dai_set_bclk_ratio - configure BCLK to sample rate ratio.

 * @dai: DAI

 * @ratio Ratio of BCLK to Sample rate.

 *

 * Configures the DAI for a preset BCLK to sample rate ratio.

 */

int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)

{

	if (dai->driver && dai->driver->ops->set_bclk_ratio)

		return dai->driver->ops->set_bclk_ratio(dai, ratio);

	else

		return -EINVAL;

}

EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio);



/**

 * snd_soc_dai_set_fmt - configure DAI hardware audio format.

 * @dai: DAI