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

ASoC: Add function "rl6231_get_pre_div" to correct the dmic clock calculation 



Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 213213d9

sound/soc/codecs/rl6231.c

+47 −0
Original line number Diff line number Diff line
@@ -11,9 +11,56 @@ 
 */



#include <linux/module.h>

#include <linux/regmap.h>



#include "rl6231.h"



/**

 * rl6231_get_pre_div - Return the value of pre divider.

 *

 * @map: map for setting.

 * @reg: register.

 * @sft: shift.

 *

 * Return the value of pre divider from given register value.

 * Return negative error code for unexpected register value.

 */

int rl6231_get_pre_div(struct regmap *map, unsigned int reg, int sft)

{

	int pd, val;



	regmap_read(map, reg, &val);



	val = (val >> sft) & 0x7;



	switch (val) {

	case 0:

	case 1:

	case 2:

	case 3:

		pd = val + 1;

		break;

	case 4:

		pd = 6;

		break;

	case 5:

		pd = 8;

		break;

	case 6:

		pd = 12;

		break;

	case 7:

		pd = 16;

		break;

	default:

		pd = -EINVAL;

		break;

	}



	return pd;

}

EXPORT_SYMBOL_GPL(rl6231_get_pre_div);



/**

 * rl6231_calc_dmic_clk - Calculate the parameter of dmic.

 *

sound/soc/codecs/rl6231.h

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ 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);

int rl6231_get_pre_div(struct regmap *map, unsigned int reg, int sft);



#endif /* __RL6231_H__ */

sound/soc/codecs/rt5640.c

+4 −3
Original line number Diff line number Diff line
@@ -459,10 +459,11 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);

	int idx = -EINVAL;



	idx = rl6231_calc_dmic_clk(rt5640->sysclk);

	int idx, rate;



	rate = rt5640->sysclk / rl6231_get_pre_div(rt5640->regmap,

		RT5640_ADDA_CLK1, RT5640_I2S_PD1_SFT);

	idx = rl6231_calc_dmic_clk(rate);

	if (idx < 0)

		dev_err(codec->dev, "Failed to set DMIC clock\n");

	else

sound/soc/codecs/rt5645.c

+4 −3
Original line number Diff line number Diff line
@@ -510,10 +510,11 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);

	int idx = -EINVAL;



	idx = rl6231_calc_dmic_clk(rt5645->sysclk);

	int idx, rate;



	rate = rt5645->sysclk / rl6231_get_pre_div(rt5645->regmap,

		RT5645_ADDA_CLK1, RT5645_I2S_PD1_SFT);

	idx = rl6231_calc_dmic_clk(rate);

	if (idx < 0)

		dev_err(codec->dev, "Failed to set DMIC clock\n");

	else

sound/soc/codecs/rt5651.c

+4 −3
Original line number Diff line number Diff line
@@ -378,10 +378,11 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec);

	int idx = -EINVAL;



	idx = rl6231_calc_dmic_clk(rt5651->sysclk);

	int idx, rate;



	rate = rt5651->sysclk / rl6231_get_pre_div(rt5651->regmap,

		RT5651_ADDA_CLK1, RT5651_I2S_PD1_SFT);

	idx = rl6231_calc_dmic_clk(rate);

	if (idx < 0)

		dev_err(codec->dev, "Failed to set DMIC clock\n");

	else