ASoC: wm_hubs: Allow configuration of MICBIAS power up delay via pdata

Sometimes the analogue circuitry connected to the microphone needs some
time to settle after power up. Allow systems to configure this delay in
the platform data, the driver will then insert the required delay during
power up of paths that involve the microphone.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

4 files changed, 39 insertions, 4 deletions

diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 9fd80d688979..94737a30716b 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1520,6 +1520,8 @@ static int wm8993_probe(struct snd_soc_codec *codec)
                                       wm8993->pdata.lineout2fb,
                                       wm8993->pdata.jd_scthr,
                                       wm8993->pdata.jd_thr,
+                                      wm8993->pdata.micbias1_delay,
+                                      wm8993->pdata.micbias2_delay,
                                       wm8993->pdata.micbias1_lvl,
                                       wm8993->pdata.micbias2_lvl);
 
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 353612eec8bf..b74df52d2820 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3145,6 +3145,8 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
                                       pdata->lineout2fb,
                                       pdata->jd_scthr,
                                       pdata->jd_thr,
+                                      pdata->micb1_delay,
+                                      pdata->micb2_delay,
                                       pdata->micbias1_lvl,
                                       pdata->micbias2_lvl);
 
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index b2e939a8970e..7a773a835b8e 100644
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -644,6 +644,28 @@ static int lineout_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
+static int micbias_event(struct snd_soc_dapm_widget *w,
+                         struct snd_kcontrol *kcontrol, int event)
+{
+        struct snd_soc_codec *codec = w->codec;
+        struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
+
+        switch (w->shift) {
+        case WM8993_MICB1_ENA_SHIFT:
+                if (hubs->micb1_delay)
+                        msleep(hubs->micb1_delay);
+                break;
+        case WM8993_MICB2_ENA_SHIFT:
+                if (hubs->micb2_delay)
+                        msleep(hubs->micb2_delay);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 void wm_hubs_update_class_w(struct snd_soc_codec *codec)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
@@ -834,8 +856,10 @@ SND_SOC_DAPM_INPUT("IN1RP"),
 SND_SOC_DAPM_INPUT("IN2RN"),
 SND_SOC_DAPM_INPUT("IN2RP:VXRP"),
 
-SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0),
-SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0,
+                    micbias_event, SND_SOC_DAPM_POST_PMU),
+SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0,
+                    micbias_event, SND_SOC_DAPM_POST_PMU),
 
 SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
                    in1l_pga, ARRAY_SIZE(in1l_pga)),
@@ -1170,13 +1194,16 @@ EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_routes);
 int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,
                                   int lineout1_diff, int lineout2_diff,
                                   int lineout1fb, int lineout2fb,
-                                  int jd_scthr, int jd_thr, int micbias1_lvl,
-                                  int micbias2_lvl)
+                                  int jd_scthr, int jd_thr,
+                                  int micbias1_delay, int micbias2_delay,
+                                  int micbias1_lvl, int micbias2_lvl)
 {
         struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);
 
         hubs->lineout1_se = !lineout1_diff;
         hubs->lineout2_se = !lineout2_diff;
+        hubs->micb1_delay = micbias1_delay;
+        hubs->micb2_delay = micbias2_delay;
 
         if (!lineout1_diff)
                 snd_soc_update_bits(codec, WM8993_LINE_MIXER1,
diff --git a/sound/soc/codecs/wm_hubs.h b/sound/soc/codecs/wm_hubs.h
index a5a09e6f87d5..24c763df21f9 100644
--- a/sound/soc/codecs/wm_hubs.h
+++ b/sound/soc/codecs/wm_hubs.h
@@ -36,6 +36,9 @@ struct wm_hubs_data {
         struct list_head dcs_cache;
         bool (*check_class_w_digital)(struct snd_soc_codec *);
 
+        int micb1_delay;
+        int micb2_delay;
+
         bool lineout1_se;
         bool lineout1n_ena;
         bool lineout1p_ena;
@@ -56,6 +59,7 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,
                                          int lineout1_diff, int lineout2_diff,
                                          int lineout1fb, int lineout2fb,
                                          int jd_scthr, int jd_thr,
+                                         int micbias1_dly, int micbias2_dly,
                                          int micbias1_lvl, int micbias2_lvl);
 
 extern irqreturn_t wm_hubs_dcs_done(int irq, void *data);