ASoC: rt5682: Add a property for DMIC delay

The patch adds a property for DMIC delay (ms) to avoid pop noise and
changes the default delay setting.

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Link: https://lore.kernel.org/r/20200323082547.7898-2-oder_chiou@realtek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/rt5682.h b/include/sound/rt5682.h
index 96b268ac96bd614d456e056e111f1cb91d941723..e1f790561ac13b7871fe9ceccddb4bb8feb75fd0 100644 (file)
--- a/include/sound/rt5682.h
+++ b/include/sound/rt5682.h
@@ -39,6 +39,7 @@ struct rt5682_platform_data {
        enum rt5682_jd_src jd_src;
        unsigned int btndet_delay;
        unsigned int dmic_clk_rate;
+       unsigned int dmic_delay;
 
        const char *dai_clk_names[RT5682_DAI_NUM_CLKS];
 };

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index cc00d47895b5238b06557c93cbe49a9fe48c2b3b..923541a52504e79998a0d72d1a051af6bcbf44a8 100644 (file)
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -1544,10 +1544,18 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w,
 static int set_dmic_power(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
+       struct snd_soc_component *component =
+               snd_soc_dapm_to_component(w->dapm);
+       struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
+       unsigned int delay = 50;
+
+       if (rt5682->pdata.dmic_delay)
+               delay = rt5682->pdata.dmic_delay;
+
        switch (event) {
        case SND_SOC_DAPM_POST_PMU:
                /*Add delay to avoid pop noise*/
-               msleep(150);
+               msleep(delay);
                break;
 
        default:
@@ -3236,6 +3244,8 @@ static int rt5682_parse_dt(struct rt5682_priv *rt5682, struct device *dev)
                &rt5682->pdata.btndet_delay);
        device_property_read_u32(dev, "realtek,dmic-clk-rate-hz",
                &rt5682->pdata.dmic_clk_rate);
+       device_property_read_u32(dev, "realtek,dmic-delay-ms",
+               &rt5682->pdata.dmic_delay);
 
        rt5682->pdata.ldo1_en = of_get_named_gpio(dev->of_node,
                "realtek,ldo1-en-gpios", 0);