linux/arch/avr32/mach-at32ap
Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine update from Vinod Koul:
 "This includes the cookie cleanup by Russell, the addition of context
  parameter for dmaengine APIs, more arm dmaengine driver cleanup by
  moving code to dmaengine, this time for imx by Javier and pl330 by
  Boojin along with the usual driver fixes."

Fix up some fairly trivial conflicts with various other cleanups.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
  dmaengine: imx: fix the build failure on x86_64
  dmaengine: i.MX: Fix merge of cookie branch.
  dmaengine: i.MX: Add support for interleaved transfers.
  dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
  dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
  dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
  dmaengine: imx-dma: remove internal structure.
  dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
  dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
  dmaengine: imx-dma: remove sg member from internal structure.
  dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
  dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
  dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
  dmaengine: imx-dma: remove dma_mode member of internal structure.
  dmaengine: imx-dma: remove data member from internal structure.
  dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
  dmaengine: at_hdmac: add slave config operation
  dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
  dmaengine/dma_slave: introduce inline wrappers
  dma: imx-sdma: Treat firmware messages as warnings instead of erros
  ...
2012-03-29 15:34:57 -07:00
..
include/mach Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
at32ap700x.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
clock.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
clock.h avr32: Hammerhead board support 2009-01-05 15:52:04 +01:00
cpufreq.c Disintegrate asm/system.h for AVR32 2012-03-28 18:30:01 +01:00
extint.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
hmatrix.c avr32: Clean up HMATRIX code 2008-08-08 12:44:01 +02:00
hsmc.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
hsmc.h [PATCH] AVR32: Use __raw MMIO access for internal peripherals 2006-10-25 20:26:33 -07:00
intc.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
intc.h [PATCH] AVR32: Use __raw MMIO access for internal peripherals 2006-10-25 20:26:33 -07:00
Kconfig [AVR32] Add support for AT32AP7001 and AT32AP7002 2008-01-25 08:31:41 +01:00
Makefile avr32: Clean up HMATRIX code 2008-08-08 12:44:01 +02:00
pdc.c avr32: Use platform_driver_probe for pdc platform driver 2008-09-22 09:51:03 +02:00
pio.c avr32: add export.h to arch/avr32 for EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:59 -04:00
pio.h avr32: Fix typo of IFSR in a comment in the PIO header file 2008-07-04 09:48:05 +02:00
pm-at32ap700x.S avr32: Fix .size directive for cpu_enter_idle 2011-04-13 15:46:49 +02:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
pm.h avr32: Add MMIO address definitions for certain controllers 2008-08-08 12:42:14 +02:00
sdramc.h avr32: Power Management support ("standby" and "mem" modes) 2008-07-02 11:05:01 +02:00