1 files changed, 26 insertions, 3 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index a945452fce0a..31490c3e00e7 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -85,6 +85,7 @@ struct aic3x_priv {
 #define AIC3X_MODEL_33 1
 #define AIC3X_MODEL_3007 2
         u16 model;
+        unsigned int adc_settle_ms;
 };
 
 /*
@@ -539,6 +540,22 @@ SOC_DAPM_ENUM("Route", aic3x_enum[LINE2L_ENUM]);
 static const struct snd_kcontrol_new aic3x_right_line2_mux_controls =
 SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM]);
 
+static int aic3x_adc_event(struct snd_soc_dapm_widget *w,
+                           struct snd_kcontrol *kcontrol, int event)
+{
+        struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(w->codec);
+
+        /*
+         * Sleep for a device specific ADC settle time, it accounts
+         * for any artifacts caused by the ADC power, mic bias, etc.
+         * Event type has to be POST_PMU.
+         */
+        if (aic3x->adc_settle_ms)
+                msleep(aic3x->adc_settle_ms);
+
+        return 0;
+}
+
 static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
         /* Left DAC to Left Outputs */
         SND_SOC_DAPM_DAC("Left DAC", "Left Playback", DAC_PWR, 7, 0),
@@ -564,7 +581,9 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
         SND_SOC_DAPM_PGA("Mono Out", MONOLOPM_CTRL, 0, 0, NULL, 0),
 
         /* Inputs to Left ADC */
-        SND_SOC_DAPM_ADC("Left ADC", "Left Capture", LINE1L_2_LADC_CTRL, 2, 0),
+        SND_SOC_DAPM_ADC_E("Left ADC", "Left Capture",
+                           LINE1L_2_LADC_CTRL, 2, 0,
+                           aic3x_adc_event, SND_SOC_DAPM_POST_PMU),
         SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
                            &aic3x_left_pga_mixer_controls[0],
                            ARRAY_SIZE(aic3x_left_pga_mixer_controls)),
@@ -576,8 +595,9 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
                          &aic3x_left_line2_mux_controls),
 
         /* Inputs to Right ADC */
-        SND_SOC_DAPM_ADC("Right ADC", "Right Capture",
-                         LINE1R_2_RADC_CTRL, 2, 0),
+        SND_SOC_DAPM_ADC_E("Right ADC", "Right Capture",
+                           LINE1R_2_RADC_CTRL, 2, 0,
+                           aic3x_adc_event, SND_SOC_DAPM_POST_PMU),
         SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
                            &aic3x_right_pga_mixer_controls[0],
                            ARRAY_SIZE(aic3x_right_pga_mixer_controls)),
@@ -1492,6 +1512,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
         if (pdata) {
                 aic3x->gpio_reset = pdata->gpio_reset;
                 aic3x->setup = pdata->setup;
+                aic3x->adc_settle_ms = pdata->adc_settle_ms;
         } else if (np) {
                 ai3x_setup = devm_kzalloc(&i2c->dev, sizeof(*ai3x_setup),
                                                                 GFP_KERNEL);
@@ -1511,6 +1532,8 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
                         aic3x->setup = ai3x_setup;
                 }
 
+                of_property_read_u32(np, "adc-settle-ms",
+                                     &aic3x->adc_settle_ms);
         } else {
                 aic3x->gpio_reset = -1;
         }