Commit 8ccefcd2 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown

ASoC: arizona: Don't pass Fout into arizona_calc_fll

As we now calculate the FLL configuration at a later stage in the
process the fout member of the FLL structure will contain the desired
Fout frequency so no need to pass this in seperately.
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 23f785a8
...@@ -1408,13 +1408,12 @@ static int arizona_validate_fll(struct arizona_fll *fll, ...@@ -1408,13 +1408,12 @@ static int arizona_validate_fll(struct arizona_fll *fll,
static int arizona_calc_fll(struct arizona_fll *fll, static int arizona_calc_fll(struct arizona_fll *fll,
struct arizona_fll_cfg *cfg, struct arizona_fll_cfg *cfg,
unsigned int Fref, unsigned int Fref)
unsigned int Fout)
{ {
unsigned int target, div, gcd_fll; unsigned int target, div, gcd_fll;
int i, ratio; int i, ratio;
arizona_fll_dbg(fll, "Fref=%u Fout=%u\n", Fref, Fout); arizona_fll_dbg(fll, "Fref=%u Fout=%u\n", Fref, fll->fout);
/* Fref must be <=13.5MHz */ /* Fref must be <=13.5MHz */
div = 1; div = 1;
...@@ -1432,12 +1431,12 @@ static int arizona_calc_fll(struct arizona_fll *fll, ...@@ -1432,12 +1431,12 @@ static int arizona_calc_fll(struct arizona_fll *fll,
/* Fvco should be over the targt; don't check the upper bound */ /* Fvco should be over the targt; don't check the upper bound */
div = ARIZONA_FLL_MIN_OUTDIV; div = ARIZONA_FLL_MIN_OUTDIV;
while (Fout * div < ARIZONA_FLL_MIN_FVCO * fll->vco_mult) { while (fll->fout * div < ARIZONA_FLL_MIN_FVCO * fll->vco_mult) {
div++; div++;
if (div > ARIZONA_FLL_MAX_OUTDIV) if (div > ARIZONA_FLL_MAX_OUTDIV)
return -EINVAL; return -EINVAL;
} }
target = Fout * div / fll->vco_mult; target = fll->fout * div / fll->vco_mult;
cfg->outdiv = div; cfg->outdiv = div;
arizona_fll_dbg(fll, "Fvco=%dHz\n", target); arizona_fll_dbg(fll, "Fvco=%dHz\n", target);
...@@ -1565,19 +1564,19 @@ static void arizona_enable_fll(struct arizona_fll *fll) ...@@ -1565,19 +1564,19 @@ static void arizona_enable_fll(struct arizona_fll *fll)
*/ */
if (fll->ref_src >= 0 && fll->ref_freq && if (fll->ref_src >= 0 && fll->ref_freq &&
fll->ref_src != fll->sync_src) { fll->ref_src != fll->sync_src) {
arizona_calc_fll(fll, &cfg, fll->ref_freq, fll->fout); arizona_calc_fll(fll, &cfg, fll->ref_freq);
arizona_apply_fll(arizona, fll->base, &cfg, fll->ref_src, arizona_apply_fll(arizona, fll->base, &cfg, fll->ref_src,
false); false);
if (fll->sync_src >= 0) { if (fll->sync_src >= 0) {
arizona_calc_fll(fll, &cfg, fll->sync_freq, fll->fout); arizona_calc_fll(fll, &cfg, fll->sync_freq);
arizona_apply_fll(arizona, fll->base + 0x10, &cfg, arizona_apply_fll(arizona, fll->base + 0x10, &cfg,
fll->sync_src, true); fll->sync_src, true);
use_sync = true; use_sync = true;
} }
} else if (fll->sync_src >= 0) { } else if (fll->sync_src >= 0) {
arizona_calc_fll(fll, &cfg, fll->sync_freq, fll->fout); arizona_calc_fll(fll, &cfg, fll->sync_freq);
arizona_apply_fll(arizona, fll->base, &cfg, arizona_apply_fll(arizona, fll->base, &cfg,
fll->sync_src, false); fll->sync_src, false);
......
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