ASoC: rt5651: Only configure OVCD once at set_jack time

Only configure OVCD once at set_jack time, rather then configuring
it on every jack-insertion event and switch to using bit field defines
instead of hardcoding a magic value.

Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c
index be942886700de379bc525c06d9599f34a5ce673c..41d7c192ac035f5e87f2e4f1f1862e0d15078b7b 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -1637,7 +1637,15 @@ static int rt5651_set_jack(struct snd_soc_component *component,
        snd_soc_component_update_bits(component, RT5651_PWR_ANLG2,
                RT5651_PWR_JD_M, RT5651_PWR_JD_M);
 
-       snd_soc_component_update_bits(component, RT5651_MICBIAS, 0x38, 0x38);
+       snd_soc_component_update_bits(component, RT5651_MICBIAS,
+                                     RT5651_MIC1_OVCD_MASK |
+                                     RT5651_MIC1_OVTH_MASK |
+                                     RT5651_PWR_CLK12M_MASK |
+                                     RT5651_PWR_MB_MASK,
+                                     RT5651_MIC1_OVCD_DIS |
+                                     RT5651_MIC1_OVTH_600UA |
+                                     RT5651_PWR_MB_PU |
+                                     RT5651_PWR_CLK12M_PU);
 
        rt5651->hp_jack = hp_jack;
 
@@ -1842,14 +1850,8 @@ static int rt5651_jack_detect(struct snd_soc_component *component, int jack_inse
        if (jack_insert) {
                rt5651_enable_micbias1_for_ovcd(component);
                snd_soc_component_update_bits(component, RT5651_MICBIAS,
-                                   RT5651_MIC1_OVCD_MASK |
-                                   RT5651_MIC1_OVTH_MASK |
-                                   RT5651_PWR_CLK12M_MASK |
-                                   RT5651_PWR_MB_MASK,
-                                   RT5651_MIC1_OVCD_EN |
-                                   RT5651_MIC1_OVTH_600UA |
-                                   RT5651_PWR_MB_PU |
-                                   RT5651_PWR_CLK12M_PU);
+                                   RT5651_MIC1_OVCD_MASK,
+                                   RT5651_MIC1_OVCD_EN);
                msleep(100);
                if (snd_soc_component_read32(component, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR)
                        jack_type = SND_JACK_HEADPHONE;