[PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Timur Tabi]

Fix the Freescale MPC8610 HPCD sound driver so that it programs the DMACR
and PMUXCR registers in the global utilities correctly.

Signed-off-by: Timur Tabi <timur@freescale.com>
---

This patch is for 2.6.26.  A similar fix has already been made in the ASOC V2
repository.  

 sound/soc/fsl/mpc8610_hpcd.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index a00aac7..8820c3f 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -58,9 +58,9 @@ static int mpc8610_hpcd_machine_probe(struct platform_device *sound_device)
 		sound_device->dev.platform_data;
 
 	/* Program the signal routing between the SSI and the DMA */
-	guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1,
+	guts_set_dmacr(machine_data->guts, machine_data->dma_id,
 		machine_data->dma_channel_id[0], CCSR_GUTS_DMACR_DEV_SSI);
-	guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1,
+	guts_set_dmacr(machine_data->guts, machine_data->dma_id,
 		machine_data->dma_channel_id[1], CCSR_GUTS_DMACR_DEV_SSI);
 
 	guts_set_pmuxcr_dma(machine_data->guts, machine_data->dma_id,
@@ -170,9 +170,9 @@ int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
 
 	/* Restore the signal routing */
 
-	guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1,
+	guts_set_dmacr(machine_data->guts, machine_data->dma_id,
 		machine_data->dma_channel_id[0], 0);
-	guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1,
+	guts_set_dmacr(machine_data->guts, machine_data->dma_id,
 		machine_data->dma_channel_id[1], 0);
 
 	switch (machine_data->ssi_id) {
@@ -182,7 +182,7 @@ int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
 		break;
 	case 1:
 		clrsetbits_be32(&machine_data->guts->pmuxcr,
-			CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI1_LA);
+			CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI2_LA);
 		break;
 	}
 
-- 
1.5.5

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Liam Girdwood]

On Fri, 2008-06-13 at 14:02 -0500, Timur Tabi wrote:
> Fix the Freescale MPC8610 HPCD sound driver so that it programs the DMACR
> and PMUXCR registers in the global utilities correctly.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>

Acked-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Timur Tabi]

Timur Tabi wrote:
> Fix the Freescale MPC8610 HPCD sound driver so that it programs the DMACR
> and PMUXCR registers in the global utilities correctly.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> 
> This patch is for 2.6.26.  A similar fix has already been made in the ASOC V2
> repository.  

Is this patch going to get picked up for 2.6.26?  I posted it 10 days ago, but
it looks like no one noticed.

-- 
Timur Tabi
Linux kernel developer at Freescale

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Takashi Iwai]

At Mon, 23 Jun 2008 11:41:13 -0500,
Timur Tabi wrote:
> 
> Timur Tabi wrote:
> > Fix the Freescale MPC8610 HPCD sound driver so that it programs the DMACR
> > and PMUXCR registers in the global utilities correctly.
> > 
> > Signed-off-by: Timur Tabi <timur@freescale.com>
> > ---
> > 
> > This patch is for 2.6.26.  A similar fix has already been made in the ASOC V2
> > repository.  
> 
> Is this patch going to get picked up for 2.6.26?  I posted it 10 days ago, but
> it looks like no one noticed.

No, it's not pushed for 2.6.26 although it's already on my tree for
the next kernel release.  If this is an urgent fix for 2.6.26, please
show it explicitly.  Otherwise I won't do it always (especially
changes for ASoC that I cannot test by myself)...


thanks,

Takashi

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Timur Tabi]

Takashi Iwai wrote:

> No, it's not pushed for 2.6.26 although it's already on my tree for
> the next kernel release.  If this is an urgent fix for 2.6.26, please
> show it explicitly.  Otherwise I won't do it always (especially
> changes for ASoC that I cannot test by myself)...

I wouldn't say it's urgent.

-- 
Timur Tabi
Linux kernel developer at Freescale

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Takashi Iwai]

At Mon, 23 Jun 2008 11:48:07 -0500,
Timur Tabi wrote:
> 
> Takashi Iwai wrote:
> 
> > No, it's not pushed for 2.6.26 although it's already on my tree for
> > the next kernel release.  If this is an urgent fix for 2.6.26, please
> > show it explicitly.  Otherwise I won't do it always (especially
> > changes for ASoC that I cannot test by myself)...
> 
> I wouldn't say it's urgent.

In general, the patches to be pushed to 2.6.26 at this stage should be
all urgent fixes.  If not, we should postpone it.

So, if you think it's really worth to be pushed, I'll try to do it
now.  Just let me know.


Takashi

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Timur Tabi]

Takashi Iwai wrote:

> So, if you think it's really worth to be pushed, I'll try to do it
> now.  Just let me know.

At this point, I wouldn't bother.  The source code is fixed, but the end result
is that the hardware isn't programmed any differently, so it doesn't fix any
actual bugs.

-- 
Timur Tabi
Linux kernel developer at Freescale

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Takashi Iwai]

At Mon, 23 Jun 2008 11:59:57 -0500,
Timur Tabi wrote:
> 
> Takashi Iwai wrote:
> 
> > So, if you think it's really worth to be pushed, I'll try to do it
> > now.  Just let me know.
> 
> At this point, I wouldn't bother.  The source code is fixed, but the end result
> is that the hardware isn't programmed any differently, so it doesn't fix any
> actual bugs.

OK, in that case, we can put it later as post 2.6.26.
Thanks for clarification.


Takashi

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Takashi Iwai]

At Mon, 23 Jun 2008 18:46:35 +0200,
I wrote:
> 
> At Mon, 23 Jun 2008 11:41:13 -0500,
> Timur Tabi wrote:
> > 
> > Timur Tabi wrote:
> > > Fix the Freescale MPC8610 HPCD sound driver so that it programs the DMACR
> > > and PMUXCR registers in the global utilities correctly.
> > > 
> > > Signed-off-by: Timur Tabi <timur@freescale.com>
> > > ---
> > > 
> > > This patch is for 2.6.26.  A similar fix has already been made in the ASOC V2
> > > repository.  
> > 
> > Is this patch going to get picked up for 2.6.26?  I posted it 10 days ago, but
> > it looks like no one noticed.
> 
> No, it's not pushed for 2.6.26 although it's already on my tree for
> the next kernel release.  If this is an urgent fix for 2.6.26, please
> show it explicitly.  Otherwise I won't do it always (especially
> changes for ASoC that I cannot test by myself)...

Well, let me clarify a bit more: if the patch should be *merged* to
2.6.26 tree, this has to be noted somewhere.  The text "the patch is
for 2.6.26" can be understood (as I did so indeed) like that "the
patch can be applied cleanly to 2.6.26".


Takashi

Re: [PATCH] Fix register programming in Freescale MPC8610 HPCD sound driver

[Timur Tabi]

Takashi Iwai wrote:

> Well, let me clarify a bit more: if the patch should be *merged* to
> 2.6.26 tree, this has to be noted somewhere.  The text "the patch is
> for 2.6.26" can be understood (as I did so indeed) like that "the
> patch can be applied cleanly to 2.6.26".

Hmmm.  When I said, "this patch is for 2.6.26", I meant that the patch is for
2.6.26.  I guess I'll be more explicit next time.

-- 
Timur Tabi
Linux kernel developer at Freescale