ASoC: wm_adsp: Set the core enable as well as start bit for ADSP2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 19:53:59 +0000 (19:53 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 20:29:20 +0000 (20:29 +0000)
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm_adsp.c

index a41742da20cbe84a7e20b1b4bfb21c7815dfd3a2..c0b7f9d18b23e4f7365e17f9e88130da47065d7b 100644 (file)
@@ -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);