These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / dma / mmp_tdma.c

diff --git a/kernel/drivers/dma/mmp_tdma.c b/kernel/drivers/dma/mmp_tdma.c
index 449e785..3df0422 100644 (file)
--- a/kernel/drivers/dma/mmp_tdma.c
+++ b/kernel/drivers/dma/mmp_tdma.c
@@ -100,7 +100,6 @@ enum mmp_tdma_type {
        PXA910_SQU,
 };
 
-#define TDMA_ALIGNMENT         3
 #define TDMA_MAX_XFER_BYTES    SZ_64K
 
 struct mmp_tdma_chan {
@@ -657,7 +656,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
        INIT_LIST_HEAD(&tdev->device.channels);
 
        if (pdev->dev.of_node)
-               pool = of_get_named_gen_pool(pdev->dev.of_node, "asram", 0);
+               pool = of_gen_pool_get(pdev->dev.of_node, "asram", 0);
        else
                pool = sram_get_gpool("asram");
        if (!pool) {
@@ -695,7 +694,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
        tdev->device.device_pause = mmp_tdma_pause_chan;
        tdev->device.device_resume = mmp_tdma_resume_chan;
        tdev->device.device_terminate_all = mmp_tdma_terminate_all;
-       tdev->device.copy_align = TDMA_ALIGNMENT;
+       tdev->device.copy_align = DMAENGINE_ALIGN_8_BYTES;
 
        dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
        platform_set_drvdata(pdev, tdev);