Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine updates from Vinod Koul:
 "Once you have some time from extended weekend celebrations please
  consider pulling the following to get:
   - Various fixes and PCI driver for dw_dmac by Andy
   - DT binding for imx-dma by Markus & imx-sdma by Shawn
   - DT fixes for dmaengine by Lars
   - jz4740 dmac driver by Lars
   - and various fixes across the drivers"

What "extended weekend celebrations"?  I'm in the merge window, who has
time for extended celebrations..

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)
  DMA: shdma: add DT support
  DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
  DMA: shdma: (cosmetic) don't re-calculate a pointer
  dmaengine: at_hdmac: prepare clk before calling enable
  dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions
  dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()
  dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding
  ARM: at91: dt: add header to define at_hdmac configuration
  MIPS: jz4740: Correct clock gate bit for DMA controller
  MIPS: jz4740: Remove custom DMA API
  MIPS: jz4740: Register jz4740 DMA device
  dma: Add a jz4740 dmaengine driver
  MIPS: jz4740: Acquire and enable DMA controller clock
  dma: mmp_tdma: disable irq when disabling dma channel
  dmaengine: PL08x: Avoid collisions with get_signal() macro
  dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically
  dma: dw: add PCI part of the driver
  dma: dw: split driver to library part and platform code
  dma: move dw_dmac driver to an own directory
  dw_dmac: don't check resource with devm_ioremap_resource
  ...

1 files changed, 76 insertions, 1 deletions

diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index f28583370d00..ff2aab973b45 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -27,6 +27,8 @@
 #include <linux/clk.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/of_dma.h>
 
 #include <asm/irq.h>
 #include <linux/platform_data/dma-imx.h>
@@ -186,6 +188,11 @@ struct imxdma_engine {
         enum imx_dma_type               devtype;
 };
 
+struct imxdma_filter_data {
+        struct imxdma_engine    *imxdma;
+        int                      request;
+};
+
 static struct platform_device_id imx_dma_devtype[] = {
         {
                 .name = "imx1-dma",
@@ -202,6 +209,22 @@ static struct platform_device_id imx_dma_devtype[] = {
 };
 MODULE_DEVICE_TABLE(platform, imx_dma_devtype);
 
+static const struct of_device_id imx_dma_of_dev_id[] = {
+        {
+                .compatible = "fsl,imx1-dma",
+                .data = &imx_dma_devtype[IMX1_DMA],
+        }, {
+                .compatible = "fsl,imx21-dma",
+                .data = &imx_dma_devtype[IMX21_DMA],
+        }, {
+                .compatible = "fsl,imx27-dma",
+                .data = &imx_dma_devtype[IMX27_DMA],
+        }, {
+                /* sentinel */
+        }
+};
+MODULE_DEVICE_TABLE(of, imx_dma_of_dev_id);
+
 static inline int is_imx1_dma(struct imxdma_engine *imxdma)
 {
         return imxdma->devtype == IMX1_DMA;
@@ -996,17 +1019,55 @@ static void imxdma_issue_pending(struct dma_chan *chan)
         spin_unlock_irqrestore(&imxdma->lock, flags);
 }
 
+static bool imxdma_filter_fn(struct dma_chan *chan, void *param)
+{
+        struct imxdma_filter_data *fdata = param;
+        struct imxdma_channel *imxdma_chan = to_imxdma_chan(chan);
+
+        if (chan->device->dev != fdata->imxdma->dev)
+                return false;
+
+        imxdma_chan->dma_request = fdata->request;
+        chan->private = NULL;
+
+        return true;
+}
+
+static struct dma_chan *imxdma_xlate(struct of_phandle_args *dma_spec,
+                                                struct of_dma *ofdma)
+{
+        int count = dma_spec->args_count;
+        struct imxdma_engine *imxdma = ofdma->of_dma_data;
+        struct imxdma_filter_data fdata = {
+                .imxdma = imxdma,
+        };
+
+        if (count != 1)
+                return NULL;
+
+        fdata.request = dma_spec->args[0];
+
+        return dma_request_channel(imxdma->dma_device.cap_mask,
+                                        imxdma_filter_fn, &fdata);
+}
+
 static int __init imxdma_probe(struct platform_device *pdev)
         {
         struct imxdma_engine *imxdma;
         struct resource *res;
+        const struct of_device_id *of_id;
         int ret, i;
         int irq, irq_err;
 
+        of_id = of_match_device(imx_dma_of_dev_id, &pdev->dev);
+        if (of_id)
+                pdev->id_entry = of_id->data;
+
         imxdma = devm_kzalloc(&pdev->dev, sizeof(*imxdma), GFP_KERNEL);
         if (!imxdma)
                 return -ENOMEM;
 
+        imxdma->dev = &pdev->dev;
         imxdma->devtype = pdev->id_entry->driver_data;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1111,7 +1172,6 @@ static int __init imxdma_probe(struct platform_device *pdev)
                               &imxdma->dma_device.channels);
         }
 
-        imxdma->dev = &pdev->dev;
         imxdma->dma_device.dev = &pdev->dev;
 
         imxdma->dma_device.device_alloc_chan_resources = imxdma_alloc_chan_resources;
@@ -1136,8 +1196,19 @@ static int __init imxdma_probe(struct platform_device *pdev)
                 goto err;
         }
 
+        if (pdev->dev.of_node) {
+                ret = of_dma_controller_register(pdev->dev.of_node,
+                                imxdma_xlate, imxdma);
+                if (ret) {
+                        dev_err(&pdev->dev, "unable to register of_dma_controller\n");
+                        goto err_of_dma_controller;
+                }
+        }
+
         return 0;
 
+err_of_dma_controller:
+        dma_async_device_unregister(&imxdma->dma_device);
 err:
         clk_disable_unprepare(imxdma->dma_ipg);
         clk_disable_unprepare(imxdma->dma_ahb);
@@ -1150,6 +1221,9 @@ static int imxdma_remove(struct platform_device *pdev)
 
         dma_async_device_unregister(&imxdma->dma_device);
 
+        if (pdev->dev.of_node)
+                of_dma_controller_free(pdev->dev.of_node);
+
         clk_disable_unprepare(imxdma->dma_ipg);
         clk_disable_unprepare(imxdma->dma_ahb);
 
@@ -1159,6 +1233,7 @@ static int imxdma_remove(struct platform_device *pdev)
 static struct platform_driver imxdma_driver = {
         .driver         = {
                 .name   = "imx-dma",
+                .of_match_table = imx_dma_of_dev_id,
         },
         .id_table       = imx_dma_devtype,
         .remove         = imxdma_remove,