Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/pl330.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/plat-samsung/dma-ops.c
index 2cded872f22b3debd634282a408d67169ceff981,1baa8ce824324e92c63258629378b500fbc5bf1a..0747c77a2fd53d0d2a66a1f1f2377b3d7e7722f6
--- 1/arch/arm/plat-samsung/dma-ops.c
--- 2/arch/arm/plat-samsung/dma-ops.c
+++ b/arch/arm/plat-samsung/dma-ops.c
@@@ -29,15 -34,9 +29,15 @@@ static unsigned samsung_dmadev_request(
        dma_cap_zero(mask);
        dma_cap_set(info->cap, mask);
  
 -      chan = dma_request_channel(mask, pl330_filter, (void *)dma_ch);
 +      /*
 +       * If a dma channel property of a device node from device tree is
 +       * specified, use that as the fliter parameter.
 +       */
 +      filter_param = (dma_ch == DMACH_DT_PROP) ? (void *)info->dt_dmach_prop :
 +                              (void *)dma_ch;
 +      chan = dma_request_channel(mask, pl330_filter, filter_param);
  
-       if (info->direction == DMA_FROM_DEVICE) {
+       if (info->direction == DMA_DEV_TO_MEM) {
                memset(&slave_config, 0, sizeof(struct dma_slave_config));
                slave_config.direction = info->direction;
                slave_config.src_addr = info->fifo;

diff --cc arch/arm/plat-samsung/include/plat/dma-ops.h
Simple merge

diff --cc drivers/dma/pl330.c
index a626e15799a5b4a3cd3fd8fe323286c6e23e3b91,e0da795bdcb354ec60be7182f9fad348e3290eea..833254d8a784656b45720266e30f4f6d96e9fe44
--- 1/drivers/dma/pl330.c
--- 2/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -636,17 -612,15 +636,17 @@@ static struct dma_async_tx_descriptor *
        }
  
        switch (direction) {
-       case DMA_TO_DEVICE:
+       case DMA_MEM_TO_DEV:
                desc->rqcfg.src_inc = 1;
                desc->rqcfg.dst_inc = 0;
 +              desc->req.rqtype = MEMTODEV;
                src = dma_addr;
                dst = pch->fifo_addr;
                break;
-       case DMA_FROM_DEVICE:
+       case DMA_DEV_TO_MEM:
                desc->rqcfg.src_inc = 0;
                desc->rqcfg.dst_inc = 1;
 +              desc->req.rqtype = DEVTOMEM;
                src = pch->fifo_addr;
                dst = dma_addr;
                break;
@@@ -759,10 -747,9 +759,10 @@@ pl330_prep_slave_sg(struct dma_chan *ch
                else
                        list_add_tail(&desc->node, &first->node);
  
-               if (direction == DMA_TO_DEVICE) {
+               if (direction == DMA_MEM_TO_DEV) {
                        desc->rqcfg.src_inc = 1;
                        desc->rqcfg.dst_inc = 0;
 +                      desc->req.rqtype = MEMTODEV;
                        fill_px(&desc->px,
                                addr, sg_dma_address(sg), sg_dma_len(sg));
                } else {
@@@ -870,8 -856,8 +870,8 @@@ pl330_probe(struct amba_device *adev, c
        INIT_LIST_HEAD(&pd->channels);
  
        /* Initialize channel parameters */
-       num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,
-                       (u8)pi->pcfg.num_chan);
 -      num_chan = max(pdat ? (int)pdat->nr_valid_peri : 0,
 -                                      (int)pi->pcfg.num_chan);
++      num_chan = max(pdat ? (int)pdat->nr_valid_peri : (int)pi->pcfg.num_peri,
++                      (int)pi->pcfg.num_chan);
        pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
  
        for (i = 0; i < num_chan; i++) {

diff --cc drivers/misc/carma/carma-fpga-program.c
Simple merge

diff --cc drivers/spi/spi-pl022.c
Simple merge

diff --cc drivers/tty/serial/pch_uart.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc drivers/usb/renesas_usbhs/fifo.c
Simple merge