2008-07-15 12:44:46

by Roel Kluin

Subject: [PATCH] ALSA Au1xpsc: psc not disabled when TX is idle

Untested patch
---
TX idleness isn't tested, but RX twice. PSC is not disabled when TX is idle

Signed-off-by: Roel Kluin <[email protected]>
---
diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
index ba4b5c1..9384702 100644
--- a/sound/soc/au1x/psc-i2s.c
+++ b/sound/soc/au1x/psc-i2s.c
@@ -231,7 +231,7 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype)

/* if both TX and RX are idle, disable PSC */
stat = au_readl(I2S_STAT(pscdata));
- if (!(stat & (PSC_I2SSTAT_RB | PSC_I2SSTAT_RB))) {
+ if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
au_writel(0, I2S_CFG(pscdata));
au_sync();
au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));

2008-07-15 13:04:40

by Manuel Lauss

Subject: Re: [PATCH] ALSA Au1xpsc: psc not disabled when TX is idle

On Tue, Jul 15, 2008 at 02:44:24PM +0200, Roel Kluin wrote:
> Untested patch
> ---
> TX idleness isn't tested, but RX twice. PSC is not disabled when TX is idle
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> diff --git a/sound/soc/au1x/psc-i2s.c b/sound/soc/au1x/psc-i2s.c
> index ba4b5c1..9384702 100644
> --- a/sound/soc/au1x/psc-i2s.c
> +++ b/sound/soc/au1x/psc-i2s.c
> @@ -231,7 +231,7 @@ static int au1xpsc_i2s_stop(struct au1xpsc_audio_data *pscdata, int stype)
>
> /* if both TX and RX are idle, disable PSC */
> stat = au_readl(I2S_STAT(pscdata));
> - if (!(stat & (PSC_I2SSTAT_RB | PSC_I2SSTAT_RB))) {
> + if (!(stat & (PSC_I2SSTAT_TB | PSC_I2SSTAT_RB))) {
> au_writel(0, I2S_CFG(pscdata));
> au_sync();
> au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));

Ah, stupid copy-paste error. Thanks!

Acked-by: Manuel Lauss <[email protected]>

--
Manuel Lauss

2008-07-15 13:09:43

by Takashi Iwai

Subject: Re: [PATCH] ALSA Au1xpsc: psc not disabled when TX is idle

At Tue, 15 Jul 2008 15:04:29 +0200,
Manuel Lauss wrote:
>
> > au_sync();
> > au_writel(PSC_CTRL_SUSPEND, PSC_CTRL(pscdata));
>
> Ah, stupid copy-paste error. Thanks!
>
> Acked-by: Manuel Lauss <[email protected]>

Applied to sound tree now. Thanks.


Takashi