Commit ccd00d59 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown

ASoC: rt5665: move set_pll to codec level

Move set_pll function to codec level and people can use it at both
codec and dai level. Also, lower case "source" to keep it consistent.
Signed-off-by: default avatarBard Liao <bardliao@realtek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 39841944
...@@ -4222,15 +4222,15 @@ static int rt5665_set_dai_sysclk(struct snd_soc_dai *dai, ...@@ -4222,15 +4222,15 @@ static int rt5665_set_dai_sysclk(struct snd_soc_dai *dai,
return 0; return 0;
} }
static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source, static int rt5665_set_codec_pll(struct snd_soc_codec *codec, 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 = dai->codec;
struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec); struct rt5665_priv *rt5665 = snd_soc_codec_get_drvdata(codec);
struct rl6231_pll_code pll_code; struct rl6231_pll_code pll_code;
int ret; int ret;
if (Source == rt5665->pll_src && freq_in == rt5665->pll_in && if (source == rt5665->pll_src && freq_in == rt5665->pll_in &&
freq_out == rt5665->pll_out) freq_out == rt5665->pll_out)
return 0; return 0;
...@@ -4244,7 +4244,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source, ...@@ -4244,7 +4244,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source,
return 0; return 0;
} }
switch (Source) { switch (source) {
case RT5665_PLL1_S_MCLK: case RT5665_PLL1_S_MCLK:
snd_soc_update_bits(codec, RT5665_GLB_CLK, snd_soc_update_bits(codec, RT5665_GLB_CLK,
RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_MCLK); RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_MCLK);
...@@ -4262,7 +4262,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source, ...@@ -4262,7 +4262,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source,
RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_BCLK3); RT5665_PLL1_SRC_MASK, RT5665_PLL1_SRC_BCLK3);
break; break;
default: default:
dev_err(codec->dev, "Unknown PLL Source %d\n", Source); dev_err(codec->dev, "Unknown PLL Source %d\n", source);
return -EINVAL; return -EINVAL;
} }
...@@ -4284,7 +4284,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source, ...@@ -4284,7 +4284,7 @@ static int rt5665_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int Source,
rt5665->pll_in = freq_in; rt5665->pll_in = freq_in;
rt5665->pll_out = freq_out; rt5665->pll_out = freq_out;
rt5665->pll_src = Source; rt5665->pll_src = source;
return 0; return 0;
} }
...@@ -4403,7 +4403,6 @@ static const struct snd_soc_dai_ops rt5665_aif_dai_ops = { ...@@ -4403,7 +4403,6 @@ static const struct snd_soc_dai_ops rt5665_aif_dai_ops = {
.set_fmt = rt5665_set_dai_fmt, .set_fmt = rt5665_set_dai_fmt,
.set_sysclk = rt5665_set_dai_sysclk, .set_sysclk = rt5665_set_dai_sysclk,
.set_tdm_slot = rt5665_set_tdm_slot, .set_tdm_slot = rt5665_set_tdm_slot,
.set_pll = rt5665_set_dai_pll,
.set_bclk_ratio = rt5665_set_bclk_ratio, .set_bclk_ratio = rt5665_set_bclk_ratio,
}; };
...@@ -4512,7 +4511,8 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5665 = { ...@@ -4512,7 +4511,8 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5665 = {
.num_dapm_widgets = ARRAY_SIZE(rt5665_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(rt5665_dapm_widgets),
.dapm_routes = rt5665_dapm_routes, .dapm_routes = rt5665_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(rt5665_dapm_routes), .num_dapm_routes = ARRAY_SIZE(rt5665_dapm_routes),
} },
.set_pll = rt5665_set_codec_pll,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment