diff mbox

[5/7] ASoC: wm_adsp: Put DSP into low power state between loading and running

Message ID 1474375956-10443-6-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive)
State New, archived
Headers show

Commit Message

Charles Keepax Sept. 20, 2016, 12:52 p.m. UTC 
Between when we load the DSP and when it actually starts running put the
core into a lower power state where the memory is retained but nothing
is clocked.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/wm_adsp.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

Comments

Charles Keepax Sept. 21, 2016, 4:14 p.m. UTC | #1 
On Tue, Sep 20, 2016 at 01:52:34PM +0100, Charles Keepax wrote:
> Between when we load the DSP and when it actually starts running put the
> core into a lower power state where the memory is retained but nothing
> is clocked.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
> @@ -2344,6 +2355,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
>  		if (!dsp->booted)
>  			return -EIO;
>  
> +		ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
> +					 ADSP2_SYS_ENA, ADSP2_SYS_ENA);
> +		if (ret != 0)
> +			goto err;
> +

We actually need to wait for RAM_RDY again here, I will fire out
a new version of the patches in the next day or two.

Thanks,
Charles
diff mbox

Patch

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 24485ec..e0cd4fe 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2223,6 +2223,11 @@  static int wm_adsp2_ena(struct wm_adsp *dsp)
 	unsigned int val;
 	int ret, count;
 
+	ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+				 ADSP2_MEM_ENA, ADSP2_MEM_ENA);
+	if (ret != 0)
+		return ret;
+
 	ret = regmap_update_bits_async(dsp->regmap, dsp->base + ADSP2_CONTROL,
 				       ADSP2_SYS_ENA, ADSP2_SYS_ENA);
 	if (ret != 0)
@@ -2282,6 +2287,12 @@  static void wm_adsp2_boot_work(struct work_struct *work)
 
 	dsp->booted = true;
 
+	/* Turn DSP back off until we are ready to run */
+	ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+				 ADSP2_SYS_ENA, 0);
+	if (ret != 0)
+		goto err_ena;
+
 	mutex_unlock(&dsp->pwr_lock);
 
 	return;
@@ -2344,6 +2355,11 @@  int wm_adsp2_event(struct snd_soc_dapm_widget *w,
 		if (!dsp->booted)
 			return -EIO;
 
+		ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+					 ADSP2_SYS_ENA, ADSP2_SYS_ENA);
+		if (ret != 0)
+			goto err;
+
 		/* Sync set controls */
 		ret = wm_coeff_sync_controls(dsp);
 		if (ret != 0)
@@ -2382,7 +2398,8 @@  int wm_adsp2_event(struct snd_soc_dapm_widget *w,
 		dsp->booted = false;
 
 		regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
-				   ADSP2_CORE_ENA | ADSP2_START, 0);
+				   ADSP2_MEM_ENA | ADSP2_CORE_ENA | ADSP2_START,
+				   0);
 
 		/* Make sure DMAs are quiesced */
 		regmap_write(dsp->regmap, dsp->base + ADSP2_RDMA_CONFIG_1, 0);