crypto: caam - set coherent_dma_mask

Replace dma_set_mask with dma_set_mask_and_coherent, since both
streaming and coherent DMA mappings are being used.

Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index c6e9d3b2d50250e867d4b6b3d04c671ad9e66ecc..cedb56500b611988e404f60cc123dda9330f9dde 100644 (file)
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -453,11 +453,11 @@ static int caam_probe(struct platform_device *pdev)
 
        if (sizeof(dma_addr_t) == sizeof(u64))
                if (of_device_is_compatible(nprop, "fsl,sec-v5.0"))
-                       dma_set_mask(dev, DMA_BIT_MASK(40));
+                       dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40));
                else
-                       dma_set_mask(dev, DMA_BIT_MASK(36));
+                       dma_set_mask_and_coherent(dev, DMA_BIT_MASK(36));
        else
-               dma_set_mask(dev, DMA_BIT_MASK(32));
+               dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
 
        /*
         * Detect and enable JobRs

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 1d80bd3636c5b1f2cf4dc078d4934e64befc7f68..50cd1b9af2bacc4f03ed2b21b218f684be8a0b04 100644 (file)
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -476,11 +476,11 @@ static int caam_jr_probe(struct platform_device *pdev)
 
        if (sizeof(dma_addr_t) == sizeof(u64))
                if (of_device_is_compatible(nprop, "fsl,sec-v5.0-job-ring"))
-                       dma_set_mask(jrdev, DMA_BIT_MASK(40));
+                       dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(40));
                else
-                       dma_set_mask(jrdev, DMA_BIT_MASK(36));
+                       dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(36));
        else
-               dma_set_mask(jrdev, DMA_BIT_MASK(32));
+               dma_set_mask_and_coherent(jrdev, DMA_BIT_MASK(32));
 
        /* Identify the interrupt */
        jrpriv->irq = irq_of_parse_and_map(nprop, 0);