Skip to contentSkip to conversation

Fix register programming in Freescale MPC8610 HPCD sound driver

PATCH In review Timur Tabi 3 participants 10 messages Jun 13, 2008 – Jun 23, 2008

Subsystems (2)
lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH 1/1 Fix register programming in Freescale MPC8610 HPCD sound driver

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

---

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(-)
sound/soc/fsl/mpc8610_hpcd.c +5 -5
index a00aac7..8820c3f 100644
@@ -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;
 	}
 
Signature · 1 line
1.5.5
author
#2 lore raw
In reply to Timur Tabi
Quoted 8 lines · Timur Tabi

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

---

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.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#3 lore raw

At Mon, 23 Jun 2008 11:41:13 -0500,

Quoted 5 lines · Timur Tabi
Quoted 3 lines · Timur Tabi

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

Quoted 8 lines
Quoted 5 lines

---

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

author
#4 lore raw
Quoted 4 lines · Takashi Iwai

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.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#5 lore raw

At Mon, 23 Jun 2008 11:48:07 -0500,

Quoted 9 lines · Timur Tabi
Quoted 4 lines · Takashi Iwai

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

author
#6 lore raw
Quoted 2 lines · Takashi Iwai

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.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#7 lore raw

At Mon, 23 Jun 2008 11:59:57 -0500,

Quoted 9 lines · Timur Tabi
Quoted 2 lines · Takashi Iwai

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

#8 lore raw
In reply to Takashi Iwai

At Mon, 23 Jun 2008 18:46:35 +0200,

Quoted 14 lines · I wrote:

At Mon, 23 Jun 2008 11:41:13 -0500,

Quoted 11 lines · Timur Tabi
Quoted 8 lines · Timur Tabi

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

---

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

Quoted 7 lines
Quoted 2 lines

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

author
#9 lore raw
Quoted 4 lines · Takashi Iwai

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.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale