diff options
Diffstat (limited to 'sound/arm')
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 14 | ||||
-rw-r--r-- | sound/arm/pxa2xx-pcm-lib.c | 6 |
2 files changed, 5 insertions, 15 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 4bc244c40f80..236a63cdaf9f 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -63,28 +63,18 @@ static struct snd_ac97_bus_ops pxa2xx_ac97_ops = { | |||
63 | .reset = pxa2xx_ac97_legacy_reset, | 63 | .reset = pxa2xx_ac97_legacy_reset, |
64 | }; | 64 | }; |
65 | 65 | ||
66 | static struct pxad_param pxa2xx_ac97_pcm_out_req = { | ||
67 | .prio = PXAD_PRIO_LOWEST, | ||
68 | .drcmr = 12, | ||
69 | }; | ||
70 | |||
71 | static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_out = { | 66 | static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_out = { |
72 | .addr = __PREG(PCDR), | 67 | .addr = __PREG(PCDR), |
73 | .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, | 68 | .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, |
69 | .chan_name = "pcm_pcm_stereo_out", | ||
74 | .maxburst = 32, | 70 | .maxburst = 32, |
75 | .filter_data = &pxa2xx_ac97_pcm_out_req, | ||
76 | }; | ||
77 | |||
78 | static struct pxad_param pxa2xx_ac97_pcm_in_req = { | ||
79 | .prio = PXAD_PRIO_LOWEST, | ||
80 | .drcmr = 11, | ||
81 | }; | 71 | }; |
82 | 72 | ||
83 | static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_in = { | 73 | static struct snd_dmaengine_dai_dma_data pxa2xx_ac97_pcm_in = { |
84 | .addr = __PREG(PCDR), | 74 | .addr = __PREG(PCDR), |
85 | .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, | 75 | .addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, |
76 | .chan_name = "pcm_pcm_stereo_in", | ||
86 | .maxburst = 32, | 77 | .maxburst = 32, |
87 | .filter_data = &pxa2xx_ac97_pcm_in_req, | ||
88 | }; | 78 | }; |
89 | 79 | ||
90 | static struct snd_pcm *pxa2xx_ac97_pcm; | 80 | static struct snd_pcm *pxa2xx_ac97_pcm; |
diff --git a/sound/arm/pxa2xx-pcm-lib.c b/sound/arm/pxa2xx-pcm-lib.c index e8da3b8ee721..dcbe7ecc1835 100644 --- a/sound/arm/pxa2xx-pcm-lib.c +++ b/sound/arm/pxa2xx-pcm-lib.c | |||
@@ -125,9 +125,9 @@ int __pxa2xx_pcm_open(struct snd_pcm_substream *substream) | |||
125 | if (ret < 0) | 125 | if (ret < 0) |
126 | return ret; | 126 | return ret; |
127 | 127 | ||
128 | return snd_dmaengine_pcm_open_request_chan(substream, | 128 | return snd_dmaengine_pcm_open( |
129 | pxad_filter_fn, | 129 | substream, dma_request_slave_channel(rtd->cpu_dai->dev, |
130 | dma_params->filter_data); | 130 | dma_params->chan_name)); |
131 | } | 131 | } |
132 | EXPORT_SYMBOL(__pxa2xx_pcm_open); | 132 | EXPORT_SYMBOL(__pxa2xx_pcm_open); |
133 | 133 | ||