Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[mirror_ubuntu-artful-kernel.git] / drivers / dma / k3dma.c

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index 647e362f01fd178d769259061fdedc49bfe53f9c..1ba2fd73852d273ccf9f8df0e6e6cfc0144fb90d 100644 (file)
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -24,7 +24,6 @@
 #include "virt-dma.h"
 
 #define DRIVER_NAME            "k3-dma"
-#define DMA_ALIGN              3
 #define DMA_MAX_SIZE           0x1ffc
 
 #define INT_STAT               0x00
@@ -732,7 +731,7 @@ static int k3_dma_probe(struct platform_device *op)
        d->slave.device_pause = k3_dma_transfer_pause;
        d->slave.device_resume = k3_dma_transfer_resume;
        d->slave.device_terminate_all = k3_dma_terminate_all;
-       d->slave.copy_align = DMA_ALIGN;
+       d->slave.copy_align = DMAENGINE_ALIGN_8_BYTES;
 
        /* init virtual channel */
        d->chans = devm_kzalloc(&op->dev,