Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/crypto/ux500/cryp/cryp_core.c

+2 −3
Original line number Diff line number Diff line
@@ -542,8 +542,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, 
		desc = channel->device->device_prep_slave_sg(channel,

					     ctx->device->dma.sg_src,

					     ctx->device->dma.sg_src_len,

					     direction,

					     DMA_CTRL_ACK);

					     direction, DMA_CTRL_ACK, NULL);

		break;



	case DMA_FROM_DEVICE:
@@ -569,7 +568,7 @@ static int cryp_set_dma_transfer(struct cryp_ctx *ctx, 
					     ctx->device->dma.sg_dst_len,

					     direction,

					     DMA_CTRL_ACK |

					     DMA_PREP_INTERRUPT);

					     DMA_PREP_INTERRUPT, NULL);



		desc->callback = cryp_dma_out_callback;

		desc->callback_param = ctx;

drivers/crypto/ux500/hash/hash_core.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int hash_set_dma_transfer(struct hash_ctx *ctx, struct scatterlist *sg, 
			"(TO_DEVICE)", __func__);

	desc = channel->device->device_prep_slave_sg(channel,

			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) {

		dev_err(ctx->device->dev,

			"[%s]: device_prep_slave_sg() failed!", __func__);