summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@animalcreek.com>2013-01-08 11:57:45 -0700
committerHerbert Xu <herbert@gondor.apana.org.au>2013-01-20 10:16:43 +1100
commitb4b87a934c30fb91cbdd18ae028acdc361e1cf0f (patch)
tree2917f5a8ef556b911b38f28c99564f6fe9d8a49b /drivers/crypto
parentbc69d124d8141dff942c8c7fbaae76f9c0f4c796 (diff)
downloadlinux-3.10-b4b87a934c30fb91cbdd18ae028acdc361e1cf0f.tar.gz
linux-3.10-b4b87a934c30fb91cbdd18ae028acdc361e1cf0f.tar.bz2
linux-3.10-b4b87a934c30fb91cbdd18ae028acdc361e1cf0f.zip
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')
-rw-r--r--drivers/crypto/omap-aes.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index dfebd402565..d34aa5df3dc 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)
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
- dd->dma_lch_in = dma_request_channel(mask, omap_dma_filter_fn,
- &dd->dma_in);
+ dd->dma_lch_in = dma_request_slave_channel_compat(mask,
+ omap_dma_filter_fn,
+ &dd->dma_in,
+ dd->dev, "rx");
if (!dd->dma_lch_in) {
dev_err(dd->dev, "Unable to request in DMA channel\n");
goto err_dma_in;
}
- dd->dma_lch_out = dma_request_channel(mask, omap_dma_filter_fn,
- &dd->dma_out);
+ dd->dma_lch_out = dma_request_slave_channel_compat(mask,
+ omap_dma_filter_fn,
+ &dd->dma_out,
+ dd->dev, "tx");
if (!dd->dma_lch_out) {
dev_err(dd->dev, "Unable to request out DMA channel\n");
goto err_dma_out;