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

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

ASoC: Add source argument to PLL configuration 



More and more devices feature PLLs and FLLs with the ability to select
between multiple input clocks. In order to better support these devices
a new argument, source, has been added to the set_pll() configuration
API. Using set_clkdiv() is often difficult due to the need to stop the
PLL/FLL before any reconfiguration can be done.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 367da152

include/sound/soc-dai.h

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int snd_soc_dai_set_clkdiv(struct snd_soc_dai *dai, 
	int div_id, int div);



int snd_soc_dai_set_pll(struct snd_soc_dai *dai,

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

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



/* Digital Audio interface formatting */

int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt);
@@ -136,8 +136,8 @@ struct snd_soc_dai_ops { 
	 */

	int (*set_sysclk)(struct snd_soc_dai *dai,

		int clk_id, unsigned int freq, int dir);

	int (*set_pll)(struct snd_soc_dai *dai,

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

	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);



	/*

sound/soc/atmel/playpaq_wm8510.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int playpaq_wm8510_hw_params(struct snd_pcm_substream *substream, 
#endif /* CONFIG_SND_AT32_SOC_PLAYPAQ_SLAVE */





	ret = snd_soc_dai_set_pll(codec_dai, 0,

	ret = snd_soc_dai_set_pll(codec_dai, 0, 0,

					 clk_get_rate(CODEC_CLK), pll_out);

	if (ret < 0) {

		pr_warning("playpaq_wm8510: Failed to set CODEC DAI PLL (%d)\n",

sound/soc/codecs/wm8350.c

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ static inline int fll_factors(struct _fll_div *fll_div, unsigned int input, 
}



static int wm8350_set_fll(struct snd_soc_dai *codec_dai,

			  int pll_id, unsigned int freq_in,

			  int pll_id, int source, unsigned int freq_in,

			  unsigned int freq_out)

{

	struct snd_soc_codec *codec = codec_dai->codec;

sound/soc/codecs/wm8400.c

+2 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,8 @@ static int fll_factors(struct wm8400_priv *wm8400, struct fll_factors *factors, 
}



static int wm8400_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,

			      unsigned int freq_in, unsigned int freq_out)

			      int source, unsigned int freq_in,

			      unsigned int freq_out)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct wm8400_priv *wm8400 = codec->private_data;

sound/soc/codecs/wm8510.c

+2 −2
Original line number Diff line number Diff line
@@ -271,8 +271,8 @@ static void pll_factors(unsigned int target, unsigned int source) 
	pll_div.k = K;

}



static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai,

		int pll_id, unsigned int freq_in, unsigned int freq_out)

static int wm8510_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,

		int source, unsigned int freq_in, unsigned int freq_out)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	u16 reg;