summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wm_adsp.c
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2014-01-08 21:42:19 +0400
committerMark Brown <broonie@linaro.org>2014-01-08 22:17:37 +0400
commit12db5edd6986a8358b92eb3fa6f8d2ee4fe1173b (patch)
tree4bb14b7b173fedf878612a8833e26e61b699e991 /sound/soc/codecs/wm_adsp.c
parentd8a64d6ade6a27dec2b8b37e4d9630c40a373bba (diff)
downloadlinux-12db5edd6986a8358b92eb3fa6f8d2ee4fe1173b.tar.xz
ASoC: wm_adsp: Start DSP booting earlier in the DAPM process
Move the start of booting the DSP to earlier in the DAPM process, and move the final starting of the DSP to later in the DAPM process. This allows us to overlap some of the processing with other components of the system being brought up. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm_adsp.c')
-rw-r--r--sound/soc/codecs/wm_adsp.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 2087ae2eb323..a061183add67 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -1591,6 +1591,27 @@ err:
ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
}
+int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_codec *codec = w->codec;
+ struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec);
+ struct wm_adsp *dsp = &dsps[w->shift];
+
+ dsp->card = codec->card;
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ queue_work(system_unbound_wq, &dsp->boot_work);
+ break;
+ default:
+ break;
+ };
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(wm_adsp2_early_event);
+
int wm_adsp2_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
@@ -1601,11 +1622,8 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
struct wm_coeff_ctl *ctl;
int ret;
- dsp->card = codec->card;
-
switch (event) {
case SND_SOC_DAPM_POST_PMU:
- queue_work(system_unbound_wq, &dsp->boot_work);
flush_work(&dsp->boot_work);
if (!dsp->running)