aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-28 14:53:59 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-28 15:29:20 -0500
commita7f9be7ec5503166164ee4a037d6d497964ccdb6 (patch)
tree7b6271f1bfd37922b23ea505e4c6de7b5e45ecac /sound/soc
parent973838a030d2a91fbd524c95281991510ed0a865 (diff)
ASoC: wm_adsp: Set the core enable as well as start bit for ADSP2
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm_adsp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index a41742da20cb..c0b7f9d18b23 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -588,14 +588,16 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
588 588
589 ret = regmap_update_bits(dsp->regmap, 589 ret = regmap_update_bits(dsp->regmap,
590 dsp->base + ADSP2_CONTROL, 590 dsp->base + ADSP2_CONTROL,
591 ADSP2_SYS_ENA | ADSP2_START, 0); 591 ADSP2_CORE_ENA | ADSP2_START,
592 ADSP2_CORE_ENA | ADSP2_START);
592 if (ret != 0) 593 if (ret != 0)
593 goto err; 594 goto err;
594 break; 595 break;
595 596
596 case SND_SOC_DAPM_PRE_PMD: 597 case SND_SOC_DAPM_PRE_PMD:
597 regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, 598 regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
598 ADSP2_SYS_ENA | ADSP2_START, 0); 599 ADSP2_SYS_ENA | ADSP2_CORE_ENA |
600 ADSP2_START, 0);
599 601
600 if (dsp->dvfs) { 602 if (dsp->dvfs) {
601 ret = regulator_set_voltage(dsp->dvfs, 1200000, 603 ret = regulator_set_voltage(dsp->dvfs, 1200000,
@@ -620,7 +622,7 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
620 return 0; 622 return 0;
621err: 623err:
622 regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, 624 regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
623 ADSP2_SYS_ENA | ADSP2_START, 0); 625 ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0);
624 return ret; 626 return ret;
625} 627}
626EXPORT_SYMBOL_GPL(wm_adsp2_event); 628EXPORT_SYMBOL_GPL(wm_adsp2_event);