Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/Makefile
Simple merge

diff --cc drivers/dma/dmaengine.c
index 9d31d5eb95c1ea47618b01ed61206eaf315a7925,9d31d5eb95c1ea47618b01ed61206eaf315a7925,db403b8ccabd855165d7535eb095291c4c8e95a3,e5e79ced4f4b5894cac354ed6a77ee630f5892e7,9d31d5eb95c1ea47618b01ed61206eaf315a7925..235153cd7ac54618935e51b08f972c902481fa41
--- 1/drivers/dma/dmaengine.c
--- 2/drivers/dma/dmaengine.c
--- 3/drivers/dma/dmaengine.c
--- 4/drivers/dma/dmaengine.c
--- 5/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@@@@@ -690,8 -690,8 -690,10 -690,10 -690,8 +690,12 @@@@@@ int dma_async_device_register(struct dm
                !device->device_prep_dma_memset);
        BUG_ON(dma_has_cap(DMA_INTERRUPT, device->cap_mask) &&
                !device->device_prep_dma_interrupt);
++ ++   BUG_ON(dma_has_cap(DMA_SG, device->cap_mask) &&
++ ++           !device->device_prep_dma_sg);
        BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
                !device->device_prep_slave_sg);
+++ +   BUG_ON(dma_has_cap(DMA_CYCLIC, device->cap_mask) &&
+++ +           !device->device_prep_dma_cyclic);
        BUG_ON(dma_has_cap(DMA_SLAVE, device->cap_mask) &&
                !device->device_control);
     

diff --cc drivers/dma/ste_dma40.c
index 662d7e35f8627f6472d8de897e8d83c20c4c1bac,17e2600a00cf5c292bb1c99c35ffe96eaa4cbc57,d5fd098e22e884efcb7eecdae5c830f4855faee9,17e2600a00cf5c292bb1c99c35ffe96eaa4cbc57,17e2600a00cf5c292bb1c99c35ffe96eaa4cbc57..3f76cd9af7c317ded4c2a290e4ab957098e38f76
--- 1/drivers/dma/ste_dma40.c
--- 2/drivers/dma/ste_dma40.c
--- 3/drivers/dma/ste_dma40.c
--- 4/drivers/dma/ste_dma40.c
--- 5/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@@@@@ -349,67 -357,22 -357,22 -357,22 -357,22 +349,67 @@@@@@ static void d40_pool_lli_free(struct d4
        d40d->lli_log.dst = NULL;
        d40d->lli_phy.src = NULL;
        d40d->lli_phy.dst = NULL;
 ----   d40d->lli_phy.src_addr = 0;
 ----   d40d->lli_phy.dst_addr = 0;
     }
     
 ----static dma_cookie_t d40_assign_cookie(struct d40_chan *d40c,
 ----                                 struct d40_desc *desc)
 ++++static int d40_lcla_alloc_one(struct d40_chan *d40c,
 ++++                         struct d40_desc *d40d)
  +  {
 - --   dma_cookie_t cookie = d40c->chan.cookie;
 ++++   unsigned long flags;
 ++++   int i;
 ++++   int ret = -EINVAL;
 ++++   int p;
  +  
 - --   if (++cookie < 0)
 - --           cookie = 1;
 ++++   spin_lock_irqsave(&d40c->base->lcla_pool.lock, flags);
 ++++
 ++++   p = d40c->phy_chan->num * D40_LCLA_LINK_PER_EVENT_GRP;
  +  
 - --   d40c->chan.cookie = cookie;
 - --   desc->txd.cookie = cookie;
 ++++   /*
 ++++    * Allocate both src and dst at the same time, therefore the half
 ++++    * start on 1 since 0 can't be used since zero is used as end marker.
 ++++    */
 ++++   for (i = 1 ; i < D40_LCLA_LINK_PER_EVENT_GRP / 2; i++) {
 ++++           if (!d40c->base->lcla_pool.alloc_map[p + i]) {
 ++++                   d40c->base->lcla_pool.alloc_map[p + i] = d40d;
 ++++                   d40d->lcla_alloc++;
 ++++                   ret = i;
 ++++                   break;
 ++++           }
 ++++   }
 ++++
 ++++   spin_unlock_irqrestore(&d40c->base->lcla_pool.lock, flags);
 ++++
 ++++   return ret;
 ++++}
 ++++
 ++++static int d40_lcla_free_all(struct d40_chan *d40c,
 ++++                        struct d40_desc *d40d)
 + ++{
  -     dma_cookie_t cookie = d40c->chan.cookie;
 ++++   unsigned long flags;
 ++++   int i;
 ++++   int ret = -EINVAL;
 ++++
 ++++   if (d40c->log_num == D40_PHY_CHAN)
 ++++           return 0;
 + ++
  -     if (++cookie < 0)
  -             cookie = 1;
 ++++   spin_lock_irqsave(&d40c->base->lcla_pool.lock, flags);
 ++++
 ++++   for (i = 1 ; i < D40_LCLA_LINK_PER_EVENT_GRP / 2; i++) {
 ++++           if (d40c->base->lcla_pool.alloc_map[d40c->phy_chan->num *
 ++++                                               D40_LCLA_LINK_PER_EVENT_GRP + i] == d40d) {
 ++++                   d40c->base->lcla_pool.alloc_map[d40c->phy_chan->num *
 ++++                                                   D40_LCLA_LINK_PER_EVENT_GRP + i] = NULL;
 ++++                   d40d->lcla_alloc--;
 ++++                   if (d40d->lcla_alloc == 0) {
 ++++                           ret = 0;
 ++++                           break;
 ++++                   }
 ++++           }
 ++++   }
 ++++
 ++++   spin_unlock_irqrestore(&d40c->base->lcla_pool.lock, flags);
 + ++
  -     d40c->chan.cookie = cookie;
  -     desc->txd.cookie = cookie;
 ++++   return ret;
     
 ----   return cookie;
     }
     
     static void d40_desc_remove(struct d40_desc *d40d)

diff --cc include/linux/dmaengine.h
Simple merge