Commit f7329e71 authored by Andreas Westin's avatar Andreas Westin Committed by Herbert Xu

crypto: ux500 - Update DMA handling for 3.4

An update to the DMA framework added a new parameter to the
device_prep_slave_sg call.
Signed-off-by: default avatarAndreas Westin <andreas.westin@stericsson.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 585d188f
...@@ -542,8 +542,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, ...@@ -542,8 +542,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
desc = channel->device->device_prep_slave_sg(channel, desc = channel->device->device_prep_slave_sg(channel,
ctx->device->dma.sg_src, ctx->device->dma.sg_src,
ctx->device->dma.sg_src_len, ctx->device->dma.sg_src_len,
direction, direction, DMA_CTRL_ACK, NULL);
DMA_CTRL_ACK);
break; break;
case DMA_FROM_DEVICE: case DMA_FROM_DEVICE:
...@@ -569,7 +568,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, ...@@ -569,7 +568,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx,
ctx->device->dma.sg_dst_len, ctx->device->dma.sg_dst_len,
direction, direction,
DMA_CTRL_ACK | DMA_CTRL_ACK |
DMA_PREP_INTERRUPT); DMA_PREP_INTERRUPT, NULL);
desc->callback = cryp_dma_out_callback; desc->callback = cryp_dma_out_callback;
desc->callback_param = ctx; desc->callback_param = ctx;
......
...@@ -174,7 +174,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg, ...@@ -174,7 +174,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg,
"(TO_DEVICE)", __func__); "(TO_DEVICE)", __func__);
desc = channel->device->device_prep_slave_sg(channel, desc = channel->device->device_prep_slave_sg(channel,
ctx->device->dma.sg, ctx->device->dma.sg_len, ctx->device->dma.sg, ctx->device->dma.sg_len,
direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT); direction, DMA_CTRL_ACK | DMA_PREP_INTERRUPT, NULL);
if (!desc) { if (!desc) {
dev_err(ctx->device->dev, dev_err(ctx->device->dev,
"[%s]: device_prep_slave_sg() failed!", __func__); "[%s]: device_prep_slave_sg() failed!", __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment