[PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Haavard Skinnemoen]

s/PDC_PTCR/ATMEL_PDC_PTCR/

Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
---
 sound/soc/at32/at32-pcm.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/at32/at32-pcm.c b/sound/soc/at32/at32-pcm.c
index 435f1da..c83584f 100644
--- a/sound/soc/at32/at32-pcm.c
+++ b/sound/soc/at32/at32-pcm.c
@@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
 	params = prtd->params;
 
 	/* Disable the PDC and save the PDC registers */
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
+		   params->mask->pdc_disable);
 
 	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
 	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
@@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
 	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
 	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
 
-	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
+	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
 	return 0;
 }
 #else /* CONFIG_PM */
-- 
1.5.6.5

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Mark Brown]

On Fri, Sep 19, 2008 at 06:50:45PM +0200, Haavard Skinnemoen wrote:
> s/PDC_PTCR/ATMEL_PDC_PTCR/
> 
> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Please submit all ALSA patches to alsa-devel (added to the CC).

>  sound/soc/at32/at32-pcm.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/at32/at32-pcm.c b/sound/soc/at32/at32-pcm.c
> index 435f1da..c83584f 100644
> --- a/sound/soc/at32/at32-pcm.c
> +++ b/sound/soc/at32/at32-pcm.c
> @@ -434,7 +434,8 @@ static int at32_pcm_suspend(struct platform_device *pdev,
>  	params = prtd->params;
>  
>  	/* Disable the PDC and save the PDC registers */
> -	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable);
> +	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR,
> +		   params->mask->pdc_disable);
>  
>  	prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr);
>  	prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr);
> @@ -464,7 +465,7 @@ static int at32_pcm_resume(struct platform_device *pdev,
>  	ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save);
>  	ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save);
>  
> -	ssc_writex(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable);
> +	ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable);
>  	return 0;
>  }
>  #else /* CONFIG_PM */
> -- 
> 1.5.6.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

-- 
"You grabbed my hand and we fell into it, like a daydream - or a fever."

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Haavard Skinnemoen]

Mark Brown <broonie@sirena.org.uk> wrote:
> On Fri, Sep 19, 2008 at 06:50:45PM +0200, Haavard Skinnemoen wrote:
> > s/PDC_PTCR/ATMEL_PDC_PTCR/
> > 
> > Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Thanks.

> Please submit all ALSA patches to alsa-devel (added to the CC).

I would if it wasn't listed as subscribers-only...but from a closer
look, it appears like it's only moderated for non-subscribers. Should I
resend the patch?

Btw, Liam Girdwood's mail address from MAINTAINERS doesn't work.

Haavard

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Liam Girdwood]

On Fri, 2008-09-19 at 21:14 +0200, Haavard Skinnemoen wrote:
> Mark Brown <broonie@sirena.org.uk> wrote:
> > On Fri, Sep 19, 2008 at 06:50:45PM +0200, Haavard Skinnemoen wrote:
> > > s/PDC_PTCR/ATMEL_PDC_PTCR/
> > > 
> > > Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
> > 
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> Thanks.
> 
> > Please submit all ALSA patches to alsa-devel (added to the CC).
> 
> I would if it wasn't listed as subscribers-only...but from a closer
> look, it appears like it's only moderated for non-subscribers. Should I
> resend the patch?
> 
> Btw, Liam Girdwood's mail address from MAINTAINERS doesn't work.
> 

It's just been updated.
 
Patch went in yesterday !

Liam

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Mark Brown]

On Fri, Sep 19, 2008 at 09:14:37PM +0200, Haavard Skinnemoen wrote:
> Mark Brown <broonie@sirena.org.uk> wrote:

> > Please submit all ALSA patches to alsa-devel (added to the CC).

> I would if it wasn't listed as subscribers-only...but from a closer
> look, it appears like it's only moderated for non-subscribers. Should I
> resend the patch?

Probably best, yes.  Or if the subscribers thing is an issue you could
send it to Takashi directly.

> Btw, Liam Girdwood's mail address from MAINTAINERS doesn't work.

Yup, he's now lrg@slimlogic.co.uk (I'd updated the address for this
thread when I replied).  He's submitted a patch for MAINTAINERS already
but it's not propagated beyond ALSA git yet.

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Takashi Iwai]

At Fri, 19 Sep 2008 21:14:37 +0200,
Haavard Skinnemoen wrote:
> 
> Mark Brown <broonie@sirena.org.uk> wrote:
> > On Fri, Sep 19, 2008 at 06:50:45PM +0200, Haavard Skinnemoen wrote:
> > > s/PDC_PTCR/ATMEL_PDC_PTCR/
> > > 
> > > Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
> > 
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> Thanks.
> 
> > Please submit all ALSA patches to alsa-devel (added to the CC).
> 
> I would if it wasn't listed as subscribers-only...but from a closer
> look, it appears like it's only moderated for non-subscribers. Should I
> resend the patch?

Don't worry, I already applied it now.
Will include in the next push request.


thanks,

Takashi

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Takashi Iwai]

At Fri, 19 Sep 2008 18:50:45 +0200,
Haavard Skinnemoen wrote:
> 
> s/PDC_PTCR/ATMEL_PDC_PTCR/

We have also SSC_PDC_PTCR there.
Maybe better to unify them, too?

Takashi

Re: [PATCH] ASoC: Fix at32-pcm build breakage with PM enabled

[Haavard Skinnemoen]

On Mon, 22 Sep 2008 12:17:38 +0200
Takashi Iwai <tiwai@suse.de> wrote:

> At Fri, 19 Sep 2008 18:50:45 +0200,
> Haavard Skinnemoen wrote:
> > 
> > s/PDC_PTCR/ATMEL_PDC_PTCR/  
> 
> We have also SSC_PDC_PTCR there.
> Maybe better to unify them, too?

Yes...I was sort of wondering about that...

It's probably best to get rid of SSC_PDC_PTCR and friends and use the
common definitions from include/linux/atmel_pdc.h.

Haavard