WSL2-Linux-Kernel/include/linux/amba
Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...
2013-02-26 09:24:48 -08:00
..
bus.h ARM: 7588/1: amba: create a resource parent registrator 2012-12-03 11:15:35 +00:00
clcd.h Fix common misspellings 2011-03-31 11:26:23 -03:00
kmi.h
mmci.h ARM: 7219/1: mmc: mmci: Change vdd_handler to a generic ios_handler 2012-01-20 00:00:56 +00:00
pl08x.h dmaengine: PL08x: get rid of unnecessary checks in dma_slave_config 2012-07-01 14:15:48 +01:00
pl022.h spi/pl022: Add chip select handling via GPIO 2012-08-22 20:00:44 +01:00
pl061.h gpio: pl061: convert to use 0 for no irq 2012-01-04 10:10:19 -06:00
pl080.h pl080.h: moved from arm/include/asm/hardware to include/linux/amba/ 2013-01-13 05:19:45 -08:00
pl093.h ARM: PL093: Header file for PL093 SSMC PrimeCell 2009-07-30 23:22:54 +01:00
pl330.h DMA: PL330: Merge PL330 driver into drivers/dma/ 2012-03-08 17:59:28 +05:30
serial.h serial: pl011: delete reset callback 2012-09-10 16:33:02 -07:00
sp810.h arm: Move sp810.h to include/linux/amba/ 2013-01-30 15:55:45 +00:00