ASoC: samsung: Correct I2S DAI suspend/resume ops
commit d3d4e5247b
upstream.
We should save/restore relevant I2S registers regardless of
the dai->active flag, otherwise some settings are being lost
after system suspend/resume cycle. E.g. I2S slave mode set only
during dai initialization is not preserved and the device ends
up in master mode after system resume.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1866d24375
commit
7e2dc8d3b7
|
@ -915,11 +915,9 @@ static int i2s_suspend(struct snd_soc_dai *dai)
|
|||
{
|
||||
struct i2s_dai *i2s = to_info(dai);
|
||||
|
||||
if (dai->active) {
|
||||
i2s->suspend_i2smod = readl(i2s->addr + I2SMOD);
|
||||
i2s->suspend_i2scon = readl(i2s->addr + I2SCON);
|
||||
i2s->suspend_i2spsr = readl(i2s->addr + I2SPSR);
|
||||
}
|
||||
i2s->suspend_i2smod = readl(i2s->addr + I2SMOD);
|
||||
i2s->suspend_i2scon = readl(i2s->addr + I2SCON);
|
||||
i2s->suspend_i2spsr = readl(i2s->addr + I2SPSR);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -928,11 +926,9 @@ static int i2s_resume(struct snd_soc_dai *dai)
|
|||
{
|
||||
struct i2s_dai *i2s = to_info(dai);
|
||||
|
||||
if (dai->active) {
|
||||
writel(i2s->suspend_i2scon, i2s->addr + I2SCON);
|
||||
writel(i2s->suspend_i2smod, i2s->addr + I2SMOD);
|
||||
writel(i2s->suspend_i2spsr, i2s->addr + I2SPSR);
|
||||
}
|
||||
writel(i2s->suspend_i2scon, i2s->addr + I2SCON);
|
||||
writel(i2s->suspend_i2smod, i2s->addr + I2SMOD);
|
||||
writel(i2s->suspend_i2spsr, i2s->addr + I2SPSR);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue