From 4bb20b66e3b5e17826d47ffdf65f29b6e118aff0 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 28 Nov 2012 19:53:59 +0000 Subject: [PATCH] --- yaml --- r: 342652 b: refs/heads/master c: a7f9be7ec5503166164ee4a037d6d497964ccdb6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm_adsp.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4d842ebff68..00e3b6ca42d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 973838a030d2a91fbd524c95281991510ed0a865 +refs/heads/master: a7f9be7ec5503166164ee4a037d6d497964ccdb6 diff --git a/trunk/sound/soc/codecs/wm_adsp.c b/trunk/sound/soc/codecs/wm_adsp.c index a41742da20cb..c0b7f9d18b23 100644 --- a/trunk/sound/soc/codecs/wm_adsp.c +++ b/trunk/sound/soc/codecs/wm_adsp.c @@ -588,14 +588,16 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, - ADSP2_SYS_ENA | ADSP2_START, 0); + ADSP2_CORE_ENA | ADSP2_START, + ADSP2_CORE_ENA | ADSP2_START); if (ret != 0) goto err; break; case SND_SOC_DAPM_PRE_PMD: regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, - ADSP2_SYS_ENA | ADSP2_START, 0); + ADSP2_SYS_ENA | ADSP2_CORE_ENA | + ADSP2_START, 0); if (dsp->dvfs) { ret = regulator_set_voltage(dsp->dvfs, 1200000, @@ -620,7 +622,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w, return 0; err: regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, - ADSP2_SYS_ENA | ADSP2_START, 0); + ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0); return ret; } EXPORT_SYMBOL_GPL(wm_adsp2_event);