mm: disable DEFERRED_STRUCT_PAGE_INIT on !NO_BOOTMEM
[cascardo/linux.git] / drivers / dma / bcm2835-dma.c
index a1d851a..6149b27 100644 (file)
@@ -46,6 +46,9 @@
 
 #include "virt-dma.h"
 
+#define BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED 14
+#define BCM2835_DMA_CHAN_NAME_SIZE 8
+
 struct bcm2835_dmadev {
        struct dma_device ddev;
        spinlock_t lock;
@@ -73,7 +76,6 @@ struct bcm2835_chan {
        struct list_head node;
 
        struct dma_slave_config cfg;
-       bool cyclic;
        unsigned int dreq;
 
        int ch;
@@ -82,6 +84,9 @@ struct bcm2835_chan {
 
        void __iomem *chan_base;
        int irq_number;
+       unsigned int irq_flags;
+
+       bool is_lite_channel;
 };
 
 struct bcm2835_desc {
@@ -89,10 +94,12 @@ struct bcm2835_desc {
        struct virt_dma_desc vd;
        enum dma_transfer_direction dir;
 
-       struct bcm2835_cb_entry *cb_list;
-
        unsigned int frames;
        size_t size;
+
+       bool cyclic;
+
+       struct bcm2835_cb_entry cb_list[];
 };
 
 #define BCM2835_DMA_CS         0x00
@@ -168,6 +175,23 @@ struct bcm2835_desc {
 #define BCM2835_DMA_CHAN(n)    ((n) << 8) /* Base address */
 #define BCM2835_DMA_CHANIO(base, n) ((base) + BCM2835_DMA_CHAN(n))
 
+/* the max dma length for different channels */
+#define MAX_DMA_LEN SZ_1G
+#define MAX_LITE_DMA_LEN (SZ_64K - 4)
+
+static inline size_t bcm2835_dma_max_frame_length(struct bcm2835_chan *c)
+{
+       /* lite and normal channels have different max frame length */
+       return c->is_lite_channel ? MAX_LITE_DMA_LEN : MAX_DMA_LEN;
+}
+
+/* how many frames of max_len size do we need to transfer len bytes */
+static inline size_t bcm2835_dma_frames_for_length(size_t len,
+                                                  size_t max_len)
+{
+       return DIV_ROUND_UP(len, max_len);
+}
+
 static inline struct bcm2835_dmadev *to_bcm2835_dma_dev(struct dma_device *d)
 {
        return container_of(d, struct bcm2835_dmadev, ddev);
@@ -184,19 +208,209 @@ static inline struct bcm2835_desc *to_bcm2835_dma_desc(
        return container_of(t, struct bcm2835_desc, vd.tx);
 }
 
-static void bcm2835_dma_desc_free(struct virt_dma_desc *vd)
+static void bcm2835_dma_free_cb_chain(struct bcm2835_desc *desc)
 {
-       struct bcm2835_desc *desc = container_of(vd, struct bcm2835_desc, vd);
-       int i;
+       size_t i;
 
        for (i = 0; i < desc->frames; i++)
                dma_pool_free(desc->c->cb_pool, desc->cb_list[i].cb,
                              desc->cb_list[i].paddr);
 
-       kfree(desc->cb_list);
        kfree(desc);
 }
 
+static void bcm2835_dma_desc_free(struct virt_dma_desc *vd)
+{
+       bcm2835_dma_free_cb_chain(
+               container_of(vd, struct bcm2835_desc, vd));
+}
+
+static void bcm2835_dma_create_cb_set_length(
+       struct bcm2835_chan *chan,
+       struct bcm2835_dma_cb *control_block,
+       size_t len,
+       size_t period_len,
+       size_t *total_len,
+       u32 finalextrainfo)
+{
+       size_t max_len = bcm2835_dma_max_frame_length(chan);
+
+       /* set the length taking lite-channel limitations into account */
+       control_block->length = min_t(u32, len, max_len);
+
+       /* finished if we have no period_length */
+       if (!period_len)
+               return;
+
+       /*
+        * period_len means: that we need to generate
+        * transfers that are terminating at every
+        * multiple of period_len - this is typically
+        * used to set the interrupt flag in info
+        * which is required during cyclic transfers
+        */
+
+       /* have we filled in period_length yet? */
+       if (*total_len + control_block->length < period_len)
+               return;
+
+       /* calculate the length that remains to reach period_length */
+       control_block->length = period_len - *total_len;
+
+       /* reset total_length for next period */
+       *total_len = 0;
+
+       /* add extrainfo bits in info */
+       control_block->info |= finalextrainfo;
+}
+
+static inline size_t bcm2835_dma_count_frames_for_sg(
+       struct bcm2835_chan *c,
+       struct scatterlist *sgl,
+       unsigned int sg_len)
+{
+       size_t frames = 0;
+       struct scatterlist *sgent;
+       unsigned int i;
+       size_t plength = bcm2835_dma_max_frame_length(c);
+
+       for_each_sg(sgl, sgent, sg_len, i)
+               frames += bcm2835_dma_frames_for_length(
+                       sg_dma_len(sgent), plength);
+
+       return frames;
+}
+
+/**
+ * bcm2835_dma_create_cb_chain - create a control block and fills data in
+ *
+ * @chan:           the @dma_chan for which we run this
+ * @direction:      the direction in which we transfer
+ * @cyclic:         it is a cyclic transfer
+ * @info:           the default info bits to apply per controlblock
+ * @frames:         number of controlblocks to allocate
+ * @src:            the src address to assign (if the S_INC bit is set
+ *                  in @info, then it gets incremented)
+ * @dst:            the dst address to assign (if the D_INC bit is set
+ *                  in @info, then it gets incremented)
+ * @buf_len:        the full buffer length (may also be 0)
+ * @period_len:     the period length when to apply @finalextrainfo
+ *                  in addition to the last transfer
+ *                  this will also break some control-blocks early
+ * @finalextrainfo: additional bits in last controlblock
+ *                  (or when period_len is reached in case of cyclic)
+ * @gfp:            the GFP flag to use for allocation
+ */
+static struct bcm2835_desc *bcm2835_dma_create_cb_chain(
+       struct dma_chan *chan, enum dma_transfer_direction direction,
+       bool cyclic, u32 info, u32 finalextrainfo, size_t frames,
+       dma_addr_t src, dma_addr_t dst, size_t buf_len,
+       size_t period_len, gfp_t gfp)
+{
+       struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
+       size_t len = buf_len, total_len;
+       size_t frame;
+       struct bcm2835_desc *d;
+       struct bcm2835_cb_entry *cb_entry;
+       struct bcm2835_dma_cb *control_block;
+
+       if (!frames)
+               return NULL;
+
+       /* allocate and setup the descriptor. */
+       d = kzalloc(sizeof(*d) + frames * sizeof(struct bcm2835_cb_entry),
+                   gfp);
+       if (!d)
+               return NULL;
+
+       d->c = c;
+       d->dir = direction;
+       d->cyclic = cyclic;
+
+       /*
+        * Iterate over all frames, create a control block
+        * for each frame and link them together.
+        */
+       for (frame = 0, total_len = 0; frame < frames; d->frames++, frame++) {
+               cb_entry = &d->cb_list[frame];
+               cb_entry->cb = dma_pool_alloc(c->cb_pool, gfp,
+                                             &cb_entry->paddr);
+               if (!cb_entry->cb)
+                       goto error_cb;
+
+               /* fill in the control block */
+               control_block = cb_entry->cb;
+               control_block->info = info;
+               control_block->src = src;
+               control_block->dst = dst;
+               control_block->stride = 0;
+               control_block->next = 0;
+               /* set up length in control_block if requested */
+               if (buf_len) {
+                       /* calculate length honoring period_length */
+                       bcm2835_dma_create_cb_set_length(
+                               c, control_block,
+                               len, period_len, &total_len,
+                               cyclic ? finalextrainfo : 0);
+
+                       /* calculate new remaining length */
+                       len -= control_block->length;
+               }
+
+               /* link this the last controlblock */
+               if (frame)
+                       d->cb_list[frame - 1].cb->next = cb_entry->paddr;
+
+               /* update src and dst and length */
+               if (src && (info & BCM2835_DMA_S_INC))
+                       src += control_block->length;
+               if (dst && (info & BCM2835_DMA_D_INC))
+                       dst += control_block->length;
+
+               /* Length of total transfer */
+               d->size += control_block->length;
+       }
+
+       /* the last frame requires extra flags */
+       d->cb_list[d->frames - 1].cb->info |= finalextrainfo;
+
+       /* detect a size missmatch */
+       if (buf_len && (d->size != buf_len))
+               goto error_cb;
+
+       return d;
+error_cb:
+       bcm2835_dma_free_cb_chain(d);
+
+       return NULL;
+}
+
+static void bcm2835_dma_fill_cb_chain_with_sg(
+       struct dma_chan *chan,
+       enum dma_transfer_direction direction,
+       struct bcm2835_cb_entry *cb,
+       struct scatterlist *sgl,
+       unsigned int sg_len)
+{
+       struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
+       size_t max_len = bcm2835_dma_max_frame_length(c);
+       unsigned int i, len;
+       dma_addr_t addr;
+       struct scatterlist *sgent;
+
+       for_each_sg(sgl, sgent, sg_len, i) {
+               for (addr = sg_dma_address(sgent), len = sg_dma_len(sgent);
+                    len > 0;
+                    addr += cb->cb->length, len -= cb->cb->length, cb++) {
+                       if (direction == DMA_DEV_TO_MEM)
+                               cb->cb->dst = addr;
+                       else
+                               cb->cb->src = addr;
+                       cb->cb->length = min(len, max_len);
+               }
+       }
+}
+
 static int bcm2835_dma_abort(void __iomem *chan_base)
 {
        unsigned long cs;
@@ -256,6 +470,15 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data)
        struct bcm2835_desc *d;
        unsigned long flags;
 
+       /* check the shared interrupt */
+       if (c->irq_flags & IRQF_SHARED) {
+               /* check if the interrupt is enabled */
+               flags = readl(c->chan_base + BCM2835_DMA_CS);
+               /* if not set then we are not the reason for the irq */
+               if (!(flags & BCM2835_DMA_INT))
+                       return IRQ_NONE;
+       }
+
        spin_lock_irqsave(&c->vc.lock, flags);
 
        /* Acknowledge interrupt */
@@ -264,12 +487,18 @@ static irqreturn_t bcm2835_dma_callback(int irq, void *data)
        d = c->desc;
 
        if (d) {
-               /* TODO Only works for cyclic DMA */
-               vchan_cyclic_callback(&d->vd);
-       }
+               if (d->cyclic) {
+                       /* call the cyclic callback */
+                       vchan_cyclic_callback(&d->vd);
 
-       /* Keep the DMA engine running */
-       writel(BCM2835_DMA_ACTIVE, c->chan_base + BCM2835_DMA_CS);
+                       /* Keep the DMA engine running */
+                       writel(BCM2835_DMA_ACTIVE,
+                              c->chan_base + BCM2835_DMA_CS);
+               } else {
+                       vchan_cookie_complete(&c->desc->vd);
+                       bcm2835_dma_start_desc(c);
+               }
+       }
 
        spin_unlock_irqrestore(&c->vc.lock, flags);
 
@@ -290,8 +519,8 @@ static int bcm2835_dma_alloc_chan_resources(struct dma_chan *chan)
                return -ENOMEM;
        }
 
-       return request_irq(c->irq_number,
-                       bcm2835_dma_callback, 0, "DMA IRQ", c);
+       return request_irq(c->irq_number, bcm2835_dma_callback,
+                          c->irq_flags, "DMA IRQ", c);
 }
 
 static void bcm2835_dma_free_chan_resources(struct dma_chan *chan)
@@ -377,8 +606,6 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan)
        struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
        unsigned long flags;
 
-       c->cyclic = true; /* Nothing else is implemented */
-
        spin_lock_irqsave(&c->vc.lock, flags);
        if (vchan_issue_pending(&c->vc) && !c->desc)
                bcm2835_dma_start_desc(c);
@@ -386,122 +613,160 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan)
        spin_unlock_irqrestore(&c->vc.lock, flags);
 }
 
-static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
-       struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
-       size_t period_len, enum dma_transfer_direction direction,
-       unsigned long flags)
+struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy(
+       struct dma_chan *chan, dma_addr_t dst, dma_addr_t src,
+       size_t len, unsigned long flags)
 {
        struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
-       enum dma_slave_buswidth dev_width;
        struct bcm2835_desc *d;
-       dma_addr_t dev_addr;
-       unsigned int es, sync_type;
-       unsigned int frame;
-       int i;
+       u32 info = BCM2835_DMA_D_INC | BCM2835_DMA_S_INC;
+       u32 extra = BCM2835_DMA_INT_EN | BCM2835_DMA_WAIT_RESP;
+       size_t max_len = bcm2835_dma_max_frame_length(c);
+       size_t frames;
+
+       /* if src, dst or len is not given return with an error */
+       if (!src || !dst || !len)
+               return NULL;
+
+       /* calculate number of frames */
+       frames = bcm2835_dma_frames_for_length(len, max_len);
+
+       /* allocate the CB chain - this also fills in the pointers */
+       d = bcm2835_dma_create_cb_chain(chan, DMA_MEM_TO_MEM, false,
+                                       info, extra, frames,
+                                       src, dst, len, 0, GFP_KERNEL);
+       if (!d)
+               return NULL;
+
+       return vchan_tx_prep(&c->vc, &d->vd, flags);
+}
+
+static struct dma_async_tx_descriptor *bcm2835_dma_prep_slave_sg(
+       struct dma_chan *chan,
+       struct scatterlist *sgl, unsigned int sg_len,
+       enum dma_transfer_direction direction,
+       unsigned long flags, void *context)
+{
+       struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
+       struct bcm2835_desc *d;
+       dma_addr_t src = 0, dst = 0;
+       u32 info = BCM2835_DMA_WAIT_RESP;
+       u32 extra = BCM2835_DMA_INT_EN;
+       size_t frames;
 
-       /* Grab configuration */
        if (!is_slave_direction(direction)) {
-               dev_err(chan->device->dev, "%s: bad direction?\n", __func__);
+               dev_err(chan->device->dev,
+                       "%s: bad direction?\n", __func__);
                return NULL;
        }
 
+       if (c->dreq != 0)
+               info |= BCM2835_DMA_PER_MAP(c->dreq);
+
        if (direction == DMA_DEV_TO_MEM) {
-               dev_addr = c->cfg.src_addr;
-               dev_width = c->cfg.src_addr_width;
-               sync_type = BCM2835_DMA_S_DREQ;
+               if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
+                       return NULL;
+               src = c->cfg.src_addr;
+               info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
        } else {
-               dev_addr = c->cfg.dst_addr;
-               dev_width = c->cfg.dst_addr_width;
-               sync_type = BCM2835_DMA_D_DREQ;
+               if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
+                       return NULL;
+               dst = c->cfg.dst_addr;
+               info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
        }
 
-       /* Bus width translates to the element size (ES) */
-       switch (dev_width) {
-       case DMA_SLAVE_BUSWIDTH_4_BYTES:
-               es = BCM2835_DMA_DATA_TYPE_S32;
-               break;
-       default:
-               return NULL;
-       }
+       /* count frames in sg list */
+       frames = bcm2835_dma_count_frames_for_sg(c, sgl, sg_len);
 
-       /* Now allocate and setup the descriptor. */
-       d = kzalloc(sizeof(*d), GFP_NOWAIT);
+       /* allocate the CB chain */
+       d = bcm2835_dma_create_cb_chain(chan, direction, false,
+                                       info, extra,
+                                       frames, src, dst, 0, 0,
+                                       GFP_KERNEL);
        if (!d)
                return NULL;
 
-       d->c = c;
-       d->dir = direction;
-       d->frames = buf_len / period_len;
+       /* fill in frames with scatterlist pointers */
+       bcm2835_dma_fill_cb_chain_with_sg(chan, direction, d->cb_list,
+                                         sgl, sg_len);
+
+       return vchan_tx_prep(&c->vc, &d->vd, flags);
+}
+
+static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
+       struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
+       size_t period_len, enum dma_transfer_direction direction,
+       unsigned long flags)
+{
+       struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
+       struct bcm2835_desc *d;
+       dma_addr_t src, dst;
+       u32 info = BCM2835_DMA_WAIT_RESP;
+       u32 extra = BCM2835_DMA_INT_EN;
+       size_t max_len = bcm2835_dma_max_frame_length(c);
+       size_t frames;
 
-       d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
-       if (!d->cb_list) {
-               kfree(d);
+       /* Grab configuration */
+       if (!is_slave_direction(direction)) {
+               dev_err(chan->device->dev, "%s: bad direction?\n", __func__);
                return NULL;
        }
-       /* Allocate memory for control blocks */
-       for (i = 0; i < d->frames; i++) {
-               struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
 
-               cb_entry->cb = dma_pool_zalloc(c->cb_pool, GFP_ATOMIC,
-                                              &cb_entry->paddr);
-               if (!cb_entry->cb)
-                       goto error_cb;
+       if (!buf_len) {
+               dev_err(chan->device->dev,
+                       "%s: bad buffer length (= 0)\n", __func__);
+               return NULL;
        }
 
        /*
-        * Iterate over all frames, create a control block
-        * for each frame and link them together.
+        * warn if buf_len is not a multiple of period_len - this may leed
+        * to unexpected latencies for interrupts and thus audiable clicks
         */
-       for (frame = 0; frame < d->frames; frame++) {
-               struct bcm2835_dma_cb *control_block = d->cb_list[frame].cb;
-
-               /* Setup adresses */
-               if (d->dir == DMA_DEV_TO_MEM) {
-                       control_block->info = BCM2835_DMA_D_INC;
-                       control_block->src = dev_addr;
-                       control_block->dst = buf_addr + frame * period_len;
-               } else {
-                       control_block->info = BCM2835_DMA_S_INC;
-                       control_block->src = buf_addr + frame * period_len;
-                       control_block->dst = dev_addr;
-               }
+       if (buf_len % period_len)
+               dev_warn_once(chan->device->dev,
+                             "%s: buffer_length (%zd) is not a multiple of period_len (%zd)\n",
+                             __func__, buf_len, period_len);
 
-               /* Enable interrupt */
-               control_block->info |= BCM2835_DMA_INT_EN;
+       /* Setup DREQ channel */
+       if (c->dreq != 0)
+               info |= BCM2835_DMA_PER_MAP(c->dreq);
 
-               /* Setup synchronization */
-               if (sync_type != 0)
-                       control_block->info |= sync_type;
+       if (direction == DMA_DEV_TO_MEM) {
+               if (c->cfg.src_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
+                       return NULL;
+               src = c->cfg.src_addr;
+               dst = buf_addr;
+               info |= BCM2835_DMA_S_DREQ | BCM2835_DMA_D_INC;
+       } else {
+               if (c->cfg.dst_addr_width != DMA_SLAVE_BUSWIDTH_4_BYTES)
+                       return NULL;
+               dst = c->cfg.dst_addr;
+               src = buf_addr;
+               info |= BCM2835_DMA_D_DREQ | BCM2835_DMA_S_INC;
+       }
 
-               /* Setup DREQ channel */
-               if (c->dreq != 0)
-                       control_block->info |=
-                               BCM2835_DMA_PER_MAP(c->dreq);
+       /* calculate number of frames */
+       frames = /* number of periods */
+                DIV_ROUND_UP(buf_len, period_len) *
+                /* number of frames per period */
+                bcm2835_dma_frames_for_length(period_len, max_len);
 
-               /* Length of a frame */
-               control_block->length = period_len;
-               d->size += control_block->length;
+       /*
+        * allocate the CB chain
+        * note that we need to use GFP_NOWAIT, as the ALSA i2s dmaengine
+        * implementation calls prep_dma_cyclic with interrupts disabled.
+        */
+       d = bcm2835_dma_create_cb_chain(chan, direction, true,
+                                       info, extra,
+                                       frames, src, dst, buf_len,
+                                       period_len, GFP_NOWAIT);
+       if (!d)
+               return NULL;
 
-               /*
-                * Next block is the next frame.
-                * This DMA engine driver currently only supports cyclic DMA.
-                * Therefore, wrap around at number of frames.
-                */
-               control_block->next = d->cb_list[((frame + 1) % d->frames)].paddr;
-       }
+       /* wrap around into a loop */
+       d->cb_list[d->frames - 1].cb->next = d->cb_list[0].paddr;
 
        return vchan_tx_prep(&c->vc, &d->vd, flags);
-error_cb:
-       i--;
-       for (; i >= 0; i--) {
-               struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
-
-               dma_pool_free(c->cb_pool, cb_entry->cb, cb_entry->paddr);
-       }
-
-       kfree(d->cb_list);
-       kfree(d);
-       return NULL;
 }
 
 static int bcm2835_dma_slave_config(struct dma_chan *chan,
@@ -567,7 +832,8 @@ static int bcm2835_dma_terminate_all(struct dma_chan *chan)
        return 0;
 }
 
-static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq)
+static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id,
+                                int irq, unsigned int irq_flags)
 {
        struct bcm2835_chan *c;
 
@@ -582,6 +848,12 @@ static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq)
        c->chan_base = BCM2835_DMA_CHANIO(d->base, chan_id);
        c->ch = chan_id;
        c->irq_number = irq;
+       c->irq_flags = irq_flags;
+
+       /* check in DEBUG register if this is a LITE channel */
+       if (readl(c->chan_base + BCM2835_DMA_DEBUG) &
+               BCM2835_DMA_DEBUG_LITE)
+               c->is_lite_channel = true;
 
        return 0;
 }
@@ -625,9 +897,11 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
        struct resource *res;
        void __iomem *base;
        int rc;
-       int i;
-       int irq;
+       int i, j;
+       int irq[BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED + 1];
+       int irq_flags;
        uint32_t chans_available;
+       char chan_name[BCM2835_DMA_CHAN_NAME_SIZE];
 
        if (!pdev->dev.dma_mask)
                pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
@@ -653,16 +927,21 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
        dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);
        dma_cap_set(DMA_PRIVATE, od->ddev.cap_mask);
        dma_cap_set(DMA_CYCLIC, od->ddev.cap_mask);
+       dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);
+       dma_cap_set(DMA_MEMCPY, od->ddev.cap_mask);
        od->ddev.device_alloc_chan_resources = bcm2835_dma_alloc_chan_resources;
        od->ddev.device_free_chan_resources = bcm2835_dma_free_chan_resources;
        od->ddev.device_tx_status = bcm2835_dma_tx_status;
        od->ddev.device_issue_pending = bcm2835_dma_issue_pending;
        od->ddev.device_prep_dma_cyclic = bcm2835_dma_prep_dma_cyclic;
+       od->ddev.device_prep_slave_sg = bcm2835_dma_prep_slave_sg;
+       od->ddev.device_prep_dma_memcpy = bcm2835_dma_prep_dma_memcpy;
        od->ddev.device_config = bcm2835_dma_slave_config;
        od->ddev.device_terminate_all = bcm2835_dma_terminate_all;
        od->ddev.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
        od->ddev.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
-       od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
+       od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV) |
+                             BIT(DMA_MEM_TO_MEM);
        od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
        od->ddev.dev = &pdev->dev;
        INIT_LIST_HEAD(&od->ddev.channels);
@@ -679,16 +958,48 @@ static int bcm2835_dma_probe(struct platform_device *pdev)
                goto err_no_dma;
        }
 
-       for (i = 0; i < pdev->num_resources; i++) {
-               irq = platform_get_irq(pdev, i);
-               if (irq < 0)
-                       break;
-
-               if (chans_available & (1 << i)) {
-                       rc = bcm2835_dma_chan_init(od, i, irq);
-                       if (rc)
-                               goto err_no_dma;
+       /* get irqs for each channel that we support */
+       for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
+               /* skip masked out channels */
+               if (!(chans_available & (1 << i))) {
+                       irq[i] = -1;
+                       continue;
                }
+
+               /* get the named irq */
+               snprintf(chan_name, sizeof(chan_name), "dma%i", i);
+               irq[i] = platform_get_irq_byname(pdev, chan_name);
+               if (irq[i] >= 0)
+                       continue;
+
+               /* legacy device tree case handling */
+               dev_warn_once(&pdev->dev,
+                             "missing interrupt-names property in device tree - legacy interpretation is used\n");
+               /*
+                * in case of channel >= 11
+                * use the 11th interrupt and that is shared
+                */
+               irq[i] = platform_get_irq(pdev, i < 11 ? i : 11);
+       }
+
+       /* get irqs for each channel */
+       for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
+               /* skip channels without irq */
+               if (irq[i] < 0)
+                       continue;
+
+               /* check if there are other channels that also use this irq */
+               irq_flags = 0;
+               for (j = 0; j <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; j++)
+                       if ((i != j) && (irq[j] == irq[i])) {
+                               irq_flags = IRQF_SHARED;
+                               break;
+                       }
+
+               /* initialize the channel */
+               rc = bcm2835_dma_chan_init(od, i, irq[i], irq_flags);
+               if (rc)
+                       goto err_no_dma;
        }
 
        dev_dbg(&pdev->dev, "Initialized %i DMA channels\n", i);