diff options
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index e97e6b28b8a7..0a063a98a661 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -59,12 +59,7 @@ static struct omap_mcbsp_data mcbsp_data[NUM_LINKS]; | |||
59 | * Stream DMA parameters. DMA request line and port address are set runtime | 59 | * Stream DMA parameters. DMA request line and port address are set runtime |
60 | * since they are different between OMAP1 and later OMAPs | 60 | * since they are different between OMAP1 and later OMAPs |
61 | */ | 61 | */ |
62 | static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2] = { | 62 | static struct omap_pcm_dma_data omap_mcbsp_dai_dma_params[NUM_LINKS][2]; |
63 | { | ||
64 | { .name = "I2S PCM Stereo out", }, | ||
65 | { .name = "I2S PCM Stereo in", }, | ||
66 | }, | ||
67 | }; | ||
68 | 63 | ||
69 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) | 64 | #if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) |
70 | static const int omap1_dma_reqs[][2] = { | 65 | static const int omap1_dma_reqs[][2] = { |
@@ -222,6 +217,8 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
222 | } else { | 217 | } else { |
223 | return -ENODEV; | 218 | return -ENODEV; |
224 | } | 219 | } |
220 | omap_mcbsp_dai_dma_params[id][substream->stream].name = | ||
221 | substream->stream ? "Audio Capture" : "Audio Playback"; | ||
225 | omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma; | 222 | omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma; |
226 | omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port; | 223 | omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port; |
227 | cpu_dai->dma_data = &omap_mcbsp_dai_dma_params[id][substream->stream]; | 224 | cpu_dai->dma_data = &omap_mcbsp_dai_dma_params[id][substream->stream]; |