Merge branch 'linus' into perf/urgent, to pick up fixes

[linux.git] / drivers / dma / sh / rcar-dmac.c

diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
index 48ee35e2bce6dd90165e8bdf085f6f1eccf5090a..74fa2b1a6a8668a6324719daaafc14e677fc07c4 100644 (file)
--- a/drivers/dma/sh/rcar-dmac.c
+++ b/drivers/dma/sh/rcar-dmac.c
@@ -198,6 +198,7 @@ struct rcar_dmac {
        struct dma_device engine;
        struct device *dev;
        void __iomem *iomem;
+       struct device_dma_parameters parms;
 
        unsigned int n_channels;
        struct rcar_dmac_chan *channels;
@@ -1792,6 +1793,8 @@ static int rcar_dmac_probe(struct platform_device *pdev)
 
        dmac->dev = &pdev->dev;
        platform_set_drvdata(pdev, dmac);
+       dmac->dev->dma_parms = &dmac->parms;
+       dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK);
        dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40));
 
        ret = rcar_dmac_parse_of(&pdev->dev, dmac);