diff options
| author | Wonjoon Lee <woojoo.lee@samsung.com> | 2016-09-22 09:50:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-09-24 14:11:04 -0400 |
| commit | 3a6f9dce6116cc54e31dc10d176ceecb1a7e4e7f (patch) | |
| tree | 71a83c9811efd80d118c0d1457a056465ce67e12 /sound/soc/rockchip/rk3399_gru_sound.c | |
| parent | 22b93eaf55edfd2f1fe9d1fc0d7338f582f12745 (diff) | |
ASoC: rk3399_gru_sound: fix recording pop at first attempt
Pop happens when mclk applied but dmic's own boot-time
Specify dmic delay times in dt to make sure
clocks are ready earlier than dmic working
Signed-off-by: Wonjoon Lee <woojoo.lee@samsung.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/rockchip/rk3399_gru_sound.c')
| -rw-r--r-- | sound/soc/rockchip/rk3399_gru_sound.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index ee0648927afc..9ed735a6cf49 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | 38 | ||
| 39 | #define SOUND_FS 256 | 39 | #define SOUND_FS 256 |
| 40 | 40 | ||
| 41 | unsigned int rt5514_dmic_delay; | ||
| 42 | |||
| 41 | static struct snd_soc_jack rockchip_sound_jack; | 43 | static struct snd_soc_jack rockchip_sound_jack; |
| 42 | 44 | ||
| 43 | static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { | 45 | static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = { |
| @@ -123,6 +125,9 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, | |||
| 123 | return ret; | 125 | return ret; |
| 124 | } | 126 | } |
| 125 | 127 | ||
| 128 | /* Wait for DMIC stable */ | ||
| 129 | msleep(rt5514_dmic_delay); | ||
| 130 | |||
| 126 | return 0; | 131 | return 0; |
| 127 | } | 132 | } |
| 128 | 133 | ||
| @@ -343,6 +348,15 @@ static int rockchip_sound_probe(struct platform_device *pdev) | |||
| 343 | return -ENODEV; | 348 | return -ENODEV; |
| 344 | } | 349 | } |
| 345 | 350 | ||
| 351 | /* Set DMIC delay */ | ||
| 352 | ret = device_property_read_u32(&pdev->dev, "dmic-delay", | ||
| 353 | &rt5514_dmic_delay); | ||
| 354 | if (ret) { | ||
| 355 | rt5514_dmic_delay = 0; | ||
| 356 | dev_dbg(&pdev->dev, | ||
| 357 | "no optional property 'dmic-delay' found, default: no delay\n"); | ||
| 358 | } | ||
| 359 | |||
| 346 | rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL); | 360 | rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL); |
| 347 | rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL); | 361 | rockchip_dailinks[DAILINK_RT5514_DSP].cpu_dai_name = kstrdup_const(dev_name(dev), GFP_KERNEL); |
| 348 | rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL); | 362 | rockchip_dailinks[DAILINK_RT5514_DSP].platform_name = kstrdup_const(dev_name(dev), GFP_KERNEL); |