2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
linux-next/arch/arm/mach-omap1
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/mach ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
ams-delta-fiq-handler.S ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
ams-delta-fiq.c arm-soc: First batch of cleanups 2012-05-22 09:23:24 -07:00
board-ams-delta.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-fsample.c - More robust parsing especially of xattr data in JFFS2 2012-06-01 16:55:42 -07:00
board-generic.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-h2-mmc.c ARM: omap: remove mmc platform data dma_mask and initialization 2012-07-31 12:06:23 +01:00
board-h2.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-h2.h ARM: OMAP: No need to include board-h2.h from hardware.h 2009-03-23 18:07:33 -07:00
board-h3-mmc.c ARM: omap: remove mmc platform data dma_mask and initialization 2012-07-31 12:06:23 +01:00
board-h3.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-h3.h ARM: OMAP: No need to include board-h3.h from hardware.h 2009-03-23 18:07:33 -07:00
board-htcherald.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-innovator.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-nand.c ARM: OMAP1: board files: deduplicate and clean some NAND-related code 2012-04-13 06:34:31 -06:00
board-nokia770.c Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm 2012-08-01 16:41:07 -07:00
board-osk.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-palmte.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-palmtt.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-palmz71.c This patch series contains a major revamp of how we collect entropy 2012-07-31 19:07:42 -07:00
board-perseus2.c - More robust parsing especially of xattr data in JFFS2 2012-06-01 16:55:42 -07:00
board-sx1-mmc.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
board-sx1.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
board-voiceblue.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
clock_data.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
clock.c ARM: OMAP2+: clean up some cppcheck warnings 2012-04-17 15:50:47 -06:00
clock.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
common.h arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
devices.c ARM: OMAP1: Pass dma request lines in platform data to MMC driver 2012-05-09 16:35:12 -07:00
dma.c ARM: OMAP1: Move most of plat/io.h into local iomap.h 2012-02-24 10:34:34 -08:00
flash.c MTD merge for 3.4 2012-03-30 17:31:56 -07:00
fpga.c ARM: OMAP2+: declare file-local functions as static 2012-04-13 06:34:26 -06:00
gpio7xx.c gpio/omap: remove virtual_irq_start variable 2012-05-11 17:08:39 -07:00
gpio15xx.c gpio/omap: remove virtual_irq_start variable 2012-05-11 17:08:39 -07:00
gpio16xx.c gpio/omap: remove virtual_irq_start variable 2012-05-11 17:08:39 -07:00
i2c.c omap: i2c: Fix muxing for command line enabled bus 2010-02-25 14:45:08 -08:00
id.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
io.c arm-soc: sweeping late_initcall cleanup 2012-05-26 13:14:01 -07:00
iomap.h ARM: create a common IOMEM definition 2012-03-13 21:22:09 -05:00
irq.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
Kconfig ARM: OMAP1: fix compilation issue in board-sx1.c 2012-05-08 17:16:24 -07:00
lcd_dma.c ARM: OMAP2+: clean up some cppcheck warnings 2012-04-17 15:50:47 -06:00
leds-h2p2-debug.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-innovator.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds-osk.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
leds.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
leds.h [PATCH] ARM: 2799/1: OMAP update 4/11: Move OMAP1 LED code into mach-omap1 directory 2005-07-10 19:58:10 +01:00
mailbox.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
Makefile ARM: OMAP1: board files: deduplicate and clean some NAND-related code 2012-04-13 06:34:31 -06:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mcbsp.c ARM: global cleanups 2012-03-27 16:03:32 -07:00
mux.c ARM: OMAP1: mux: add missing include 2012-04-09 10:50:12 -07:00
ocpi.c ARM: OMAP1: OCPI: move to mach-omap1/ 2012-04-13 06:34:27 -06:00
opp_data.c ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
opp.h ARM: OMAP1: Move dpll1 rates selection from config to runtime 2011-12-08 18:02:23 -08:00
pm_bus.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm.c ARM: OMAP2+: clean up some cppcheck warnings 2012-04-17 15:50:47 -06:00
pm.h ARM: 6649/1: omap: use fncpy to copy the PM code functions to SRAM 2011-02-04 14:26:08 +00:00
reset.c ARM: OMAP: add includes for missing prototypes 2012-04-13 06:34:26 -06:00
serial.c ARM: omap1: use machine specific hook for late init 2012-05-08 20:36:18 +08:00
sleep.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
sram.S ARM: OMAP: Remove remaining includes for mach/io.h 2012-03-06 21:34:38 -06:00
time.c ARM: OMAP1: Add checks for possible error condition in timer_init 2012-05-09 10:07:05 -07:00
timer32k.c ARM: OMAP: Make OMAP clocksource source selection using kernel param 2012-05-09 10:07:05 -07:00
timer.c ARM: OMAP: Add flag to indicate if a timer needs a manual reset 2012-06-14 02:39:47 -07:00
usb.c ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00