aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/fsl/mpc8610_hpcd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index a00aac7a71f1..8820c3f8d171 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)
58 sound_device->dev.platform_data; 58 sound_device->dev.platform_data;
59 59
60 /* Program the signal routing between the SSI and the DMA */ 60 /* Program the signal routing between the SSI and the DMA */
61 guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1, 61 guts_set_dmacr(machine_data->guts, machine_data->dma_id,
62 machine_data->dma_channel_id[0], CCSR_GUTS_DMACR_DEV_SSI); 62 machine_data->dma_channel_id[0], CCSR_GUTS_DMACR_DEV_SSI);
63 guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1, 63 guts_set_dmacr(machine_data->guts, machine_data->dma_id,
64 machine_data->dma_channel_id[1], CCSR_GUTS_DMACR_DEV_SSI); 64 machine_data->dma_channel_id[1], CCSR_GUTS_DMACR_DEV_SSI);
65 65
66 guts_set_pmuxcr_dma(machine_data->guts, machine_data->dma_id, 66 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)
170 170
171 /* Restore the signal routing */ 171 /* Restore the signal routing */
172 172
173 guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1, 173 guts_set_dmacr(machine_data->guts, machine_data->dma_id,
174 machine_data->dma_channel_id[0], 0); 174 machine_data->dma_channel_id[0], 0);
175 guts_set_dmacr(machine_data->guts, machine_data->dma_id + 1, 175 guts_set_dmacr(machine_data->guts, machine_data->dma_id,
176 machine_data->dma_channel_id[1], 0); 176 machine_data->dma_channel_id[1], 0);
177 177
178 switch (machine_data->ssi_id) { 178 switch (machine_data->ssi_id) {
@@ -182,7 +182,7 @@ int mpc8610_hpcd_machine_remove(struct platform_device *sound_device)
182 break; 182 break;
183 case 1: 183 case 1:
184 clrsetbits_be32(&machine_data->guts->pmuxcr, 184 clrsetbits_be32(&machine_data->guts->pmuxcr,
185 CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI1_LA); 185 CCSR_GUTS_PMUXCR_SSI2_MASK, CCSR_GUTS_PMUXCR_SSI2_LA);
186 break; 186 break;
187 } 187 }
188 188