diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/sh/siu.h | 3 | ||||
-rw-r--r-- | sound/soc/sh/siu_pcm.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index c0bfab8fed3d..492b1cae24cc 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h | |||
@@ -71,8 +71,7 @@ struct siu_firmware { | |||
71 | #include <linux/dmaengine.h> | 71 | #include <linux/dmaengine.h> |
72 | #include <linux/interrupt.h> | 72 | #include <linux/interrupt.h> |
73 | #include <linux/io.h> | 73 | #include <linux/io.h> |
74 | 74 | #include <linux/sh_dma.h> | |
75 | #include <asm/dmaengine.h> | ||
76 | 75 | ||
77 | #include <sound/core.h> | 76 | #include <sound/core.h> |
78 | #include <sound/pcm.h> | 77 | #include <sound/pcm.h> |
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 8f85719212f9..36170be15aa7 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <sound/pcm_params.h> | 31 | #include <sound/pcm_params.h> |
32 | #include <sound/soc-dai.h> | 32 | #include <sound/soc-dai.h> |
33 | 33 | ||
34 | #include <asm/dmaengine.h> | ||
35 | #include <asm/siu.h> | 34 | #include <asm/siu.h> |
36 | 35 | ||
37 | #include "siu.h" | 36 | #include "siu.h" |
@@ -358,13 +357,13 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) | |||
358 | if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { | 357 | if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) { |
359 | siu_stream = &port_info->playback; | 358 | siu_stream = &port_info->playback; |
360 | param = &siu_stream->param; | 359 | param = &siu_stream->param; |
361 | param->slave_id = port ? SHDMA_SLAVE_SIUB_TX : | 360 | param->slave_id = port ? pdata->dma_slave_tx_b : |
362 | SHDMA_SLAVE_SIUA_TX; | 361 | pdata->dma_slave_tx_a; |
363 | } else { | 362 | } else { |
364 | siu_stream = &port_info->capture; | 363 | siu_stream = &port_info->capture; |
365 | param = &siu_stream->param; | 364 | param = &siu_stream->param; |
366 | param->slave_id = port ? SHDMA_SLAVE_SIUB_RX : | 365 | param->slave_id = port ? pdata->dma_slave_rx_b : |
367 | SHDMA_SLAVE_SIUA_RX; | 366 | pdata->dma_slave_rx_a; |
368 | } | 367 | } |
369 | 368 | ||
370 | param->dma_dev = pdata->dma_dev; | 369 | param->dma_dev = pdata->dma_dev; |