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

Commit d92950e7 authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support 



The patch adds the function "get_clk_info" to RL6231 shared support.

Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 71c7a2d6

sound/soc/codecs/rl6231.c

+16 −0
Original line number Diff line number Diff line
@@ -131,6 +131,22 @@ int rl6231_pll_calc(const unsigned int freq_in, 
}

EXPORT_SYMBOL_GPL(rl6231_pll_calc);



int rl6231_get_clk_info(int sclk, int rate)

{

	int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};



	if (sclk <= 0 || rate <= 0)

		return -EINVAL;



	rate = rate << 8;

	for (i = 0; i < ARRAY_SIZE(pd); i++)

		if (sclk == rate * pd[i])

			return i;



	return -EINVAL;

}

EXPORT_SYMBOL_GPL(rl6231_get_clk_info);



MODULE_DESCRIPTION("RL6231 class device shared support");

MODULE_AUTHOR("Oder Chiou <oder_chiou@realtek.com>");

MODULE_LICENSE("GPL v2");

sound/soc/codecs/rl6231.h

+1 −0
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ struct rl6231_pll_code { 
int rl6231_calc_dmic_clk(int rate);

int rl6231_pll_calc(const unsigned int freq_in,

	const unsigned int freq_out, struct rl6231_pll_code *pll_code);

int rl6231_get_clk_info(int sclk, int rate);



#endif /* __RL6231_H__ */

sound/soc/codecs/rt5640.c

+1 −16
Original line number Diff line number Diff line
@@ -1625,21 +1625,6 @@ static int get_sdp_info(struct snd_soc_codec *codec, int dai_id) 
	return ret;

}



static int get_clk_info(int sclk, int rate)

{

	int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};



	if (sclk <= 0 || rate <= 0)

		return -EINVAL;



	rate = rate << 8;

	for (i = 0; i < ARRAY_SIZE(pd); i++)

		if (sclk == rate * pd[i])

			return i;



	return -EINVAL;

}



static int rt5640_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)

{
@@ -1649,7 +1634,7 @@ static int rt5640_hw_params(struct snd_pcm_substream *substream, 
	int dai_sel, pre_div, bclk_ms, frame_size;



	rt5640->lrck[dai->id] = params_rate(params);

	pre_div = get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]);

	pre_div = rl6231_get_clk_info(rt5640->sysclk, rt5640->lrck[dai->id]);

	if (pre_div < 0) {

		dev_err(codec->dev, "Unsupported clock setting %d for DAI %d\n",

			rt5640->lrck[dai->id], dai->id);

sound/soc/codecs/rt5645.c

+1 −16
Original line number Diff line number Diff line
@@ -1786,21 +1786,6 @@ static const struct snd_soc_dapm_route rt5645_dapm_routes[] = { 
	{ "SPOR", NULL, "SPK amp" },

};



static int get_clk_info(int sclk, int rate)

{

	int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};



	if (sclk <= 0 || rate <= 0)

		return -EINVAL;



	rate = rate << 8;

	for (i = 0; i < ARRAY_SIZE(pd); i++)

		if (sclk == rate * pd[i])

			return i;



	return -EINVAL;

}



static int rt5645_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)

{
@@ -1810,7 +1795,7 @@ static int rt5645_hw_params(struct snd_pcm_substream *substream, 
	int pre_div, bclk_ms, frame_size;



	rt5645->lrck[dai->id] = params_rate(params);

	pre_div = get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);

	pre_div = rl6231_get_clk_info(rt5645->sysclk, rt5645->lrck[dai->id]);

	if (pre_div < 0) {

		dev_err(codec->dev, "Unsupported clock setting\n");

		return -EINVAL;

sound/soc/codecs/rt5651.c

+1 −16
Original line number Diff line number Diff line
@@ -1338,21 +1338,6 @@ static const struct snd_soc_dapm_route rt5651_dapm_routes[] = { 
	{"PDMR", NULL, "PDM R Mux"},

};



static int get_clk_info(int sclk, int rate)

{

	int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};



	if (sclk <= 0 || rate <= 0)

		return -EINVAL;



	rate = rate << 8;

	for (i = 0; i < ARRAY_SIZE(pd); i++)

		if (sclk == rate * pd[i])

			return i;



	return -EINVAL;

}



static int rt5651_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)

{
@@ -1362,7 +1347,7 @@ static int rt5651_hw_params(struct snd_pcm_substream *substream, 
	int pre_div, bclk_ms, frame_size;



	rt5651->lrck[dai->id] = params_rate(params);

	pre_div = get_clk_info(rt5651->sysclk, rt5651->lrck[dai->id]);

	pre_div = rl6231_get_clk_info(rt5651->sysclk, rt5651->lrck[dai->id]);



	if (pre_div < 0) {

		dev_err(codec->dev, "Unsupported clock setting\n");