linux/arch/arm/include/asm/hardware
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
..
arm_timer.h ARM: vexpress: Get rid of MMIO_P2V 2012-02-23 15:09:42 +00:00
cache-l2x0.h ARM: 7547/4: cache-l2x0: add support for Aurora L2 cache ctrl 2012-11-06 19:47:35 +00:00
cache-tauros2.h ARM: cache: add extra feature enable for tauros2 2012-08-16 16:16:27 +08:00
coresight.h ARM: coresight: common definition for (OS) Lock Access Register key value 2013-01-10 21:13:05 +00:00
debug-8250.S [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
debug-pl01x.S [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
dec21285.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
entry-macro-iomd.S ARM: remove disable_fiq and arch_ret_to_user macros 2012-02-21 17:05:18 -06:00
icst.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ioc.h [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
iomd.h [ARM] clps7500: remove support 2008-11-27 12:38:11 +00:00
iop3xx-adma.h iop-adma: redundant/wrong tests in iop_*_count()? 2010-02-28 22:22:12 -07:00
iop3xx-gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
iop3xx.h ARM: iop3xx: use fixed PCI i/o mapping 2012-07-26 09:10:04 -05:00
iop_adma.h dmaengine: move last completed cookie into generic dma_chan structure 2012-03-13 11:36:06 +05:30
it8152.h ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
locomo.h [ARM] locomo: allow cascaded IRQ base to be specified by platforms 2010-03-02 07:40:50 +08:00
memc.h [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
pci_v3.h [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
sa1111.h ARM: sa1111: move USB interface register definitions to ohci-sa1111.c 2012-03-24 11:30:12 +00:00
scoop.h ARM: scoop: drop pcmcia_init callback 2011-07-11 14:43:32 +08:00
ssp.h [ARM] move include/asm-arm to arch/arm/include/asm 2008-08-02 21:32:35 +01:00
timer-sp.h ARM: timer-sp: add sched_clock support 2012-02-09 22:42:55 -06:00