diff options
author | Mark A. Greer <mgreer@animalcreek.com> | 2013-01-08 13:57:45 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-01-19 18:16:43 -0500 |
commit | b4b87a934c30fb91cbdd18ae028acdc361e1cf0f (patch) | |
tree | 2917f5a8ef556b911b38f28c99564f6fe9d8a49b /drivers/crypto/omap-aes.c | |
parent | bc69d124d8141dff942c8c7fbaae76f9c0f4c796 (diff) |
crypto: omap-aes - Convert to dma_request_slave_channel_compat()
Use the dma_request_slave_channel_compat() call instead of
the dma_request_channel() call to request a DMA channel.
This allows the omap-aes driver use different DMA engines.
CC: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/omap-aes.c')
-rw-r--r-- | drivers/crypto/omap-aes.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index dfebd4025654..d34aa5df3dc1 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c | |||
@@ -296,15 +296,19 @@ static int omap_aes_dma_init(struct omap_aes_dev *dd) | |||
296 | dma_cap_zero(mask); | 296 | dma_cap_zero(mask); |
297 | dma_cap_set(DMA_SLAVE, mask); | 297 | dma_cap_set(DMA_SLAVE, mask); |
298 | 298 | ||
299 | dd->dma_lch_in = dma_request_channel(mask, omap_dma_filter_fn, | 299 | dd->dma_lch_in = dma_request_slave_channel_compat(mask, |
300 | &dd->dma_in); | 300 | omap_dma_filter_fn, |
301 | &dd->dma_in, | ||
302 | dd->dev, "rx"); | ||
301 | if (!dd->dma_lch_in) { | 303 | if (!dd->dma_lch_in) { |
302 | dev_err(dd->dev, "Unable to request in DMA channel\n"); | 304 | dev_err(dd->dev, "Unable to request in DMA channel\n"); |
303 | goto err_dma_in; | 305 | goto err_dma_in; |
304 | } | 306 | } |
305 | 307 | ||
306 | dd->dma_lch_out = dma_request_channel(mask, omap_dma_filter_fn, | 308 | dd->dma_lch_out = dma_request_slave_channel_compat(mask, |
307 | &dd->dma_out); | 309 | omap_dma_filter_fn, |
310 | &dd->dma_out, | ||
311 | dd->dev, "tx"); | ||
308 | if (!dd->dma_lch_out) { | 312 | if (!dd->dma_lch_out) { |
309 | dev_err(dd->dev, "Unable to request out DMA channel\n"); | 313 | dev_err(dd->dev, "Unable to request out DMA channel\n"); |
310 | goto err_dma_out; | 314 | goto err_dma_out; |