ASoC: wcd934x: fix High Accuracy Buck enable

High Accuracy buck is not applicable when we use RCO Band Gap source,
so move it back to correct place.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200306132806.19684-2-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c
index aefaadf..83d643a 100644 (file)
--- a/sound/soc/codecs/wcd934x.c
+++ b/sound/soc/codecs/wcd934x.c
@@ -1202,11 +1202,6 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
                regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
                                   WCD934X_ANA_RCO_BG_EN_MASK, 0);
                usleep_range(100, 110);
-       } else if (sido_src == SIDO_SOURCE_RCO_BG) {
-               regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
-                                  WCD934X_ANA_RCO_BG_EN_MASK,
-                                  WCD934X_ANA_RCO_BG_ENABLE);
-               usleep_range(100, 110);
                regmap_update_bits(wcd->regmap, WCD934X_ANA_BUCK_CTL,
                                   WCD934X_ANA_BUCK_PRE_EN1_MASK,
                                   WCD934X_ANA_BUCK_PRE_EN1_ENABLE);
@@ -1219,6 +1214,11 @@ static int wcd934x_set_sido_input_src(struct wcd934x_codec *wcd, int sido_src)
                                   WCD934X_ANA_BUCK_HI_ACCU_EN_MASK,
                                   WCD934X_ANA_BUCK_HI_ACCU_ENABLE);
                usleep_range(100, 110);
+       } else if (sido_src == SIDO_SOURCE_RCO_BG) {
+               regmap_update_bits(wcd->regmap, WCD934X_ANA_RCO,
+                                  WCD934X_ANA_RCO_BG_EN_MASK,
+                                  WCD934X_ANA_RCO_BG_ENABLE);
+               usleep_range(100, 110);
        }
        wcd->sido_input_src = sido_src;