You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		13 years ago
..
include/plat	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
Kconfig	arm-soc: power management changes	13 years ago
Makefile	ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry	13 years ago
clock.c	ARM: OMAP: PM: Lock clocks list while generating summary	13 years ago
common.c	ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak	13 years ago
counter_32k.c	ARM: OMAP: counter-32k: Select the CR register offset using the IP scheme	13 years ago
debug-devices.c	ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h	14 years ago
debug-leds.c	Disintegrate asm/system.h for ARM	13 years ago
devices.c	ARM: OMAP: Move omap_mmc_add() to mach-omap1	13 years ago
dma.c	ARM: OMAP: dma: Clear status registers on enable/disable irq	13 years ago
dmtimer.c	ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()	13 years ago
fb.c	ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set	13 years ago
i2c.c	ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success	13 years ago
mailbox.c	ARM: OMAP: enable mailbox irq per instance	13 years ago
mux.c	Disintegrate asm/system.h for ARM	13 years ago
omap-pm-noop.c	ARM: OMAP: omap_device: remove omap_device_parent	13 years ago
omap_device.c	ARM: OMAP2+: clean up some cppcheck warnings	13 years ago
sram.c	ARM: OMAP5: Add minimal support for OMAP5430 SOC	13 years ago
sram.h	OMAP: plat-omap: Fix static function warnings	15 years ago