diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
| commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
| tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/codecs/mt6358.c | |
| parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
| parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/codecs/mt6358.c')
| -rw-r--r-- | sound/soc/codecs/mt6358.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c index 50b3fc5457ea..bb737fd678cc 100644 --- a/sound/soc/codecs/mt6358.c +++ b/sound/soc/codecs/mt6358.c @@ -1730,6 +1730,10 @@ static int mt6358_dmic_enable(struct mt6358_priv *priv) /* UL turn on */ regmap_write(priv->regmap, MT6358_AFE_UL_SRC_CON0_L, 0x0003); + + /* Prevent pop noise form dmic hw */ + msleep(100); + return 0; } @@ -2255,10 +2259,8 @@ static struct snd_soc_dai_driver mt6358_dai_driver[] = { }, }; -static int mt6358_codec_init_reg(struct mt6358_priv *priv) +static void mt6358_codec_init_reg(struct mt6358_priv *priv) { - int ret = 0; - /* Disable HeadphoneL/HeadphoneR short circuit protection */ regmap_update_bits(priv->regmap, MT6358_AUDDEC_ANA_CON0, RG_AUDHPLSCDISABLE_VAUDP15_MASK_SFT, @@ -2285,8 +2287,6 @@ static int mt6358_codec_init_reg(struct mt6358_priv *priv) /* set gpio */ playback_gpio_reset(priv); capture_gpio_reset(priv); - - return ret; } static int mt6358_codec_probe(struct snd_soc_component *cmpnt) |