ASoC: rt5677: Remove magic number register writes

In order to simplify understanding what register values are being
written to the codec for debugging more advanced features (such as
hotwording) it is best to remove magic numbers

Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Link: https://lore.kernel.org/r/20190906194636.217881-2-cujomalainey@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c
index c779dc3474f9e2c6655b545b89f2db111313f1c2..5b6ca3ced13b843d5ca2c76d7c45891b4f423c47 100644 (file)
--- a/sound/soc/codecs/rt5677.c
+++ b/sound/soc/codecs/rt5677.c
@@ -691,10 +691,12 @@ static void rt5677_set_dsp_mode(struct snd_soc_component *component, bool on)
        struct rt5677_priv *rt5677 = snd_soc_component_get_drvdata(component);
 
        if (on) {
-               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x2);
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1,
+                       RT5677_PWR_DSP, RT5677_PWR_DSP);
                rt5677->is_dsp_mode = true;
        } else {
-               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1, 0x2, 0x0);
+               regmap_update_bits(rt5677->regmap, RT5677_PWR_DSP1,
+                       RT5677_PWR_DSP, 0x0);
                rt5677->is_dsp_mode = false;
        }
 }
@@ -4466,7 +4468,8 @@ static int rt5677_set_bias_level(struct snd_soc_component *component,
 
                        regmap_update_bits(rt5677->regmap, RT5677_PWR_ANLG1,
                                RT5677_LDO1_SEL_MASK | RT5677_LDO2_SEL_MASK,
-                               0x0055);
+                               5 << RT5677_LDO1_SEL_SFT |
+                               5 << RT5677_LDO2_SEL_SFT);
                        regmap_update_bits(rt5677->regmap,
                                RT5677_PR_BASE + RT5677_BIAS_CUR4,
                                0x0f00, 0x0f00);
@@ -4491,7 +4494,9 @@ static int rt5677_set_bias_level(struct snd_soc_component *component,
                regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC, 0x1, 0x0);
                regmap_write(rt5677->regmap, RT5677_PWR_DIG1, 0x0000);
                regmap_write(rt5677->regmap, RT5677_PWR_DIG2, 0x0000);
-               regmap_write(rt5677->regmap, RT5677_PWR_ANLG1, 0x0022);
+               regmap_write(rt5677->regmap, RT5677_PWR_ANLG1,
+                       2 << RT5677_LDO1_SEL_SFT |
+                       2 << RT5677_LDO2_SEL_SFT);
                regmap_write(rt5677->regmap, RT5677_PWR_ANLG2, 0x0000);
                regmap_update_bits(rt5677->regmap,
                        RT5677_PR_BASE + RT5677_BIAS_CUR4, 0x0f00, 0x0000);
@@ -4719,7 +4724,8 @@ static int rt5677_probe(struct snd_soc_component *component)
 
        regmap_update_bits(rt5677->regmap, RT5677_DIG_MISC,
                        ~RT5677_IRQ_DEBOUNCE_SEL_MASK, 0x0020);
-       regmap_write(rt5677->regmap, RT5677_PWR_DSP2, 0x0c00);
+       regmap_write(rt5677->regmap, RT5677_PWR_DSP2,
+                       RT5677_PWR_SLIM_ISO | RT5677_PWR_CORE_ISO);
 
        for (i = 0; i < RT5677_GPIO_NUM; i++)
                rt5677_gpio_config(rt5677, i, rt5677->pdata.gpio_config[i]);