Skip to content

Commit

Permalink
ASoC: rockchip: Correct 'dmic-delay' property name
Browse files Browse the repository at this point in the history
The 'dmic-delay' property name is different with the dt-binding.

So correct it with 'dmic-wakeup-delay-ms'.

Fixes: 3a6f9dc (ASoC: rk3399_gru_sound: fix recording pop at first attempt)
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Jeffy Chen authored and Mark Brown committed Aug 22, 2017
1 parent dc94d24 commit f628c4e
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions sound/soc/rockchip/rk3399_gru_sound.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#define SOUND_FS 256

static unsigned int rt5514_dmic_delay;
static unsigned int dmic_wakeup_delay;

static struct snd_soc_jack rockchip_sound_jack;

Expand Down Expand Up @@ -126,7 +126,7 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream,
}

/* Wait for DMIC stable */
msleep(rt5514_dmic_delay);
msleep(dmic_wakeup_delay);

return 0;
}
Expand Down Expand Up @@ -348,13 +348,13 @@ static int rockchip_sound_probe(struct platform_device *pdev)
return -ENODEV;
}

/* Set DMIC delay */
ret = device_property_read_u32(&pdev->dev, "dmic-delay",
&rt5514_dmic_delay);
/* Set DMIC wakeup delay */
ret = device_property_read_u32(&pdev->dev, "dmic-wakeup-delay-ms",
&dmic_wakeup_delay);
if (ret) {
rt5514_dmic_delay = 0;
dmic_wakeup_delay = 0;
dev_dbg(&pdev->dev,
"no optional property 'dmic-delay' found, default: no delay\n");
"no optional property 'dmic-wakeup-delay-ms' found, default: no delay\n");
}

rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);
Expand Down

0 comments on commit f628c4e

Please sign in to comment.