From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Sep 2013 20:37:36 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: accepted/tizen/common/20141203.182822~1505
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec5b103ecfde929004b691f29183255aeeadecd5;p=platform%2Fkernel%2Flinux-arm64.git

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

Pull slave-dmaengine updates from Vinod Koul:
 "This pull brings:
   - Andy's DW driver updates
   - Guennadi's sh driver updates
   - Pl08x driver fixes from Tomasz & Alban
   - Improvements to mmp_pdma by Daniel
   - TI EDMA fixes by Joel
   - New drivers:
     - Hisilicon k3dma driver
     - Renesas rcar dma driver
  - New API for publishing slave driver capablities
  - Various fixes across the subsystem by Andy, Jingoo, Sachin etc..."

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (94 commits)
  dma: edma: Remove limits on number of slots
  dma: edma: Leave linked to Null slot instead of DUMMY slot
  dma: edma: Find missed events and issue them
  ARM: edma: Add function to manually trigger an EDMA channel
  dma: edma: Write out and handle MAX_NR_SG at a given time
  dma: edma: Setup parameters to DMA MAX_NR_SG at a time
  dmaengine: pl330: use dma_set_max_seg_size to set the sg limit
  dmaengine: dma_slave_caps: remove sg entries
  dma: replace devm_request_and_ioremap by devm_ioremap_resource
  dma: ste_dma40: Fix potential null pointer dereference
  dma: ste_dma40: Remove duplicate const
  dma: imx-dma: Remove redundant NULL check
  dma: dmagengine: fix function names in comments
  dma: add driver for R-Car HPB-DMAC
  dma: k3dma: use devm_ioremap_resource() instead of devm_request_and_ioremap()
  dma: imx-sdma: Staticize sdma_driver_data structures
  pch_dma: Add MODULE_DEVICE_TABLE
  dmaengine: PL08x: Add cyclic transfer support
  dmaengine: PL08x: Fix reading the byte count in cctl
  dmaengine: PL08x: Add support for different maximum transfer size
  ...
---

ec5b103ecfde929004b691f29183255aeeadecd5
diff --cc drivers/dma/Makefile
index 6d62ec3,8c97941..db89035
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -39,4 -39,4 +39,5 @@@ obj-$(CONFIG_MMP_TDMA) += mmp_tdma.
  obj-$(CONFIG_DMA_OMAP) += omap-dma.o
  obj-$(CONFIG_MMP_PDMA) += mmp_pdma.o
  obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o
 +obj-$(CONFIG_TI_CPPI41) += cppi41.o
+ obj-$(CONFIG_K3_DMA) += k3dma.o
diff --cc include/linux/dmaengine.h
index 0c72b89,2601186..0bc7275
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@@ -1006,6 -1030,8 +1042,7 @@@ static inline void dma_release_channel(
  int dma_async_device_register(struct dma_device *device);
  void dma_async_device_unregister(struct dma_device *device);
  void dma_run_dependencies(struct dma_async_tx_descriptor *tx);
 -struct dma_chan *dma_find_channel(enum dma_transaction_type tx_type);
+ struct dma_chan *dma_get_slave_channel(struct dma_chan *chan);
  struct dma_chan *net_dma_find_channel(void);
  #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
  #define dma_request_slave_channel_compat(mask, x, y, dev, name) \