kernel_samsung_sm7125

jenna

History

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/mach	ARM: OMAP: Make FS USB omap1 only	13 years ago
Kconfig	ARM: OMAP1: fix compilation issue in board-sx1.c	13 years ago
Makefile	ARM: OMAP1: board files: deduplicate and clean some NAND-related code	13 years ago
Makefile.boot	…
ams-delta-fiq-handler.S	ARM: create a common IOMEM definition	13 years ago
ams-delta-fiq.c	arm-soc: First batch of cleanups	13 years ago
board-ams-delta.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-fsample.c	- More robust parsing especially of xattr data in JFFS2	13 years ago
board-generic.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-h2-mmc.c	ARM: omap: remove mmc platform data dma_mask and initialization	13 years ago
board-h2.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-h2.h	…
board-h3-mmc.c	ARM: omap: remove mmc platform data dma_mask and initialization	13 years ago
board-h3.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-h3.h	…
board-htcherald.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-innovator.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-nand.c	ARM: OMAP1: board files: deduplicate and clean some NAND-related code	13 years ago
board-nokia770.c	Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm	13 years ago
board-osk.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-palmte.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-palmtt.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-palmz71.c	This patch series contains a major revamp of how we collect entropy	13 years ago
board-perseus2.c	- More robust parsing especially of xattr data in JFFS2	13 years ago
board-sx1-mmc.c	…
board-sx1.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
board-voiceblue.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
clock.c	ARM: OMAP2+: clean up some cppcheck warnings	13 years ago
clock.h	…
clock_data.c	ARM: OMAP: Make FS USB omap1 only	13 years ago
common.h	arm-soc: sweeping late_initcall cleanup	13 years ago
devices.c	ARM: OMAP1: Pass dma request lines in platform data to MMC driver	13 years ago
dma.c	…
flash.c	MTD merge for 3.4	13 years ago
fpga.c	ARM: OMAP2+: declare file-local functions as static	13 years ago
gpio7xx.c	gpio/omap: remove virtual_irq_start variable	13 years ago
gpio15xx.c	gpio/omap: remove virtual_irq_start variable	13 years ago
gpio16xx.c	gpio/omap: remove virtual_irq_start variable	13 years ago
i2c.c	…
id.c	ARM: OMAP: add includes for missing prototypes	13 years ago
io.c	arm-soc: sweeping late_initcall cleanup	13 years ago
iomap.h	ARM: create a common IOMEM definition	13 years ago
irq.c	ARM: OMAP: add includes for missing prototypes	13 years ago
lcd_dma.c	ARM: OMAP2+: clean up some cppcheck warnings	13 years ago
leds-h2p2-debug.c	Disintegrate asm/system.h for ARM	13 years ago
leds-innovator.c	Disintegrate asm/system.h for ARM	13 years ago
leds-osk.c	Disintegrate asm/system.h for ARM	13 years ago
leds.c	…
leds.h	…
mailbox.c	…
mcbsp.c	ARM: global cleanups	13 years ago
mux.c	ARM: OMAP1: mux: add missing include	13 years ago
ocpi.c	ARM: OMAP1: OCPI: move to mach-omap1/	13 years ago
opp.h	…
opp_data.c	…
pm.c	ARM: OMAP2+: clean up some cppcheck warnings	13 years ago
pm.h	…
pm_bus.c	…
reset.c	ARM: OMAP: add includes for missing prototypes	13 years ago
serial.c	ARM: omap1: use machine specific hook for late init	13 years ago
sleep.S	…
sram.S	…
time.c	ARM: OMAP1: Add checks for possible error condition in timer_init	13 years ago
timer.c	ARM: OMAP: Add flag to indicate if a timer needs a manual reset	13 years ago
timer32k.c	ARM: OMAP: Make OMAP clocksource source selection using kernel param	13 years ago
usb.c	ARM: OMAP: Make FS USB omap1 only	13 years ago