Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 916465a8 authored by Karl Beldan's avatar Karl Beldan Committed by Mark Brown
Browse files

ASoC: pxa2xx-i2s: Fix suspend/resume 



pxa2xx_i2s_resume is :
 - unconditionnaly setting SACR0_ENB
 - unsetting SACR0_ENB in saved SACR0 pxa_i2s.sacr0
fix these.

In pxa2xx_i2s_{resume,suspend}, save/restore registers even
when !dai->active.

Signed-off-by: default avatarKarl Beldan <karl.beldan@mobile-devices.fr>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9bc04fd1

sound/soc/pxa/pxa2xx-i2s.c

+3 −8
Original line number Diff line number Diff line
@@ -262,9 +262,6 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, 
#ifdef CONFIG_PM

static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai)

{

	if (!dai->active)

		return 0;



	/* store registers */

	pxa_i2s.sacr0 = SACR0;

	pxa_i2s.sacr1 = SACR1;
@@ -279,16 +276,14 @@ static int pxa2xx_i2s_suspend(struct snd_soc_dai *dai) 


static int pxa2xx_i2s_resume(struct snd_soc_dai *dai)

{

	if (!dai->active)

		return 0;



	pxa_i2s_wait();



	SACR0 = pxa_i2s.sacr0 &= ~SACR0_ENB;

	SACR0 = pxa_i2s.sacr0 & ~SACR0_ENB;

	SACR1 = pxa_i2s.sacr1;

	SAIMR = pxa_i2s.saimr;

	SADIV = pxa_i2s.sadiv;

	SACR0 |= SACR0_ENB;



	SACR0 = pxa_i2s.sacr0;



	return 0;

}