linux/arch/arm/plat-omap
Linus Torvalds a6dc77254b Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM DMA engine updates from Russell King:
 "This looks scary at first glance, but what it is is:
   - a rework of the sa11x0 DMA engine driver merged during the previous
     cycle, to extract a common set of helper functions for DMA engine
     implementations.
   - conversion of amba-pl08x.c to use these helper functions.
   - addition of OMAP DMA engine driver (using these helper functions),
     and conversion of some of the OMAP DMA users to use DMA engine.

  Nothing in the helper functions is ARM specific, so I hope that other
  implementations can consolidate some of their code by making use of
  these helpers.

  This has been sitting in linux-next most of the merge cycle, and has
  been tested by several OMAP folk.  I've tested it on sa11x0 platforms,
  and given it my best shot on my broken platforms which have the
  amba-pl08x controller.

  The last point is the addition to feature-removal-schedule.txt, which
  will have a merge conflict.  Between myself and TI, we're planning to
  remove the old TI DMA implementation next year."

Fix up trivial add/add conflicts in Documentation/feature-removal-schedule.txt
and drivers/dma/{Kconfig,Makefile}

* 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm: (53 commits)
  ARM: 7481/1: OMAP2+: omap2plus_defconfig: enable OMAP DMA engine
  ARM: 7464/1: mmc: omap_hsmmc: ensure probe returns error if DMA channel request fails
  Add feature removal of old OMAP private DMA implementation
  mtd: omap2: remove private DMA API implementation
  mtd: omap2: add DMA engine support
  spi: omap2-mcspi: remove private DMA API implementation
  spi: omap2-mcspi: add DMA engine support
  ARM: omap: remove mmc platform data dma_mask and initialization
  mmc: omap: remove private DMA API implementation
  mmc: omap: add DMA engine support
  mmc: omap_hsmmc: remove private DMA API implementation
  mmc: omap_hsmmc: add DMA engine support
  dmaengine: omap: add support for cyclic DMA
  dmaengine: omap: add support for setting fi
  dmaengine: omap: add support for returning residue in tx_state method
  dmaengine: add OMAP DMA engine driver
  dmaengine: sa11x0-dma: add cyclic DMA support
  dmaengine: sa11x0-dma: fix DMA residue support
  dmaengine: PL08x: ensure all descriptors are freed when channel is released
  dmaengine: PL08x: get rid of write only pool_ctr and free_txd locking
  ...
2012-08-01 16:41:07 -07:00
..
include/plat Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
Kconfig arm-soc: power management changes 2012-07-23 17:43:53 -07:00
Makefile ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry 2012-07-05 08:05:14 -07:00
clock.c ARM: OMAP: PM: Lock clocks list while generating summary 2012-06-17 11:57:50 -06:00
common.c ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak 2012-07-09 19:14:38 +05:30
counter_32k.c ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme 2012-07-09 19:14:39 +05:30
debug-devices.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
debug-leds.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
devices.c ARM: OMAP: Move omap_mmc_add() to mach-omap1 2012-05-09 16:35:12 -07:00
dma.c ARM: OMAP: dma: Clear status registers on enable/disable irq 2012-06-03 22:50:42 -07:00
dmtimer.c ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe() 2012-07-05 02:15:55 -07:00
fb.c ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set 2012-03-09 09:53:21 +02:00
i2c.c ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success 2011-11-04 17:41:07 -07:00
mailbox.c ARM: OMAP: enable mailbox irq per instance 2012-05-13 16:09:39 +03:00
mux.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
omap-pm-noop.c ARM: OMAP: omap_device: remove omap_device_parent 2012-03-05 15:38:02 -08:00
omap_device.c ARM: OMAP2+: clean up some cppcheck warnings 2012-04-17 15:50:47 -06:00
sram.c ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
sram.h OMAP: plat-omap: Fix static function warnings 2010-10-08 10:12:38 -07:00