ASoC: arizona: Calculate OUTDIV first
OUTDIV will remain unchanged whilst the rest of the FLL configuration is
calculated so do this first.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 7b1354a..1f106ab 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1415,6 +1415,18 @@
arizona_fll_dbg(fll, "Fref=%u Fout=%u\n", Fref, fll->fout);
+ /* Fvco should be over the targt; don't check the upper bound */
+ div = ARIZONA_FLL_MIN_OUTDIV;
+ while (fll->fout * div < ARIZONA_FLL_MIN_FVCO * fll->vco_mult) {
+ div++;
+ if (div > ARIZONA_FLL_MAX_OUTDIV)
+ return -EINVAL;
+ }
+ target = fll->fout * div / fll->vco_mult;
+ cfg->outdiv = div;
+
+ arizona_fll_dbg(fll, "Fvco=%dHz\n", target);
+
/* Fref must be <=13.5MHz */
div = 1;
cfg->refdiv = 0;
@@ -1429,18 +1441,6 @@
/* Apply the division for our remaining calculations */
Fref /= div;
- /* Fvco should be over the targt; don't check the upper bound */
- div = ARIZONA_FLL_MIN_OUTDIV;
- while (fll->fout * div < ARIZONA_FLL_MIN_FVCO * fll->vco_mult) {
- div++;
- if (div > ARIZONA_FLL_MAX_OUTDIV)
- return -EINVAL;
- }
- target = fll->fout * div / fll->vco_mult;
- cfg->outdiv = div;
-
- arizona_fll_dbg(fll, "Fvco=%dHz\n", target);
-
/* Find an appropraite FLL_FRATIO and factor it out of the target */
for (i = 0; i < ARRAY_SIZE(fll_fratios); i++) {
if (fll_fratios[i].min <= Fref && Fref <= fll_fratios[i].max) {