kernel_optimize_test/arch/arm/plat-omap/include/plat
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
..
am33xx.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
board-ams-delta.h ASoC: OMAP: ams-delta: drop .set_bias_level callback 2012-03-05 11:25:34 -08:00
board-sx1.h
board-voiceblue.h
board.h ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
clkdev_omap.h ARM: OMAP3+: clock33xx: Add AM33XX clock tree data 2012-06-29 16:16:40 -06:00
clock.h ARM: OMAP2+: CLEANUP: Remove ARCH_OMAPx ifdef from struct dpll_data 2012-06-18 16:17:44 -06:00
common.h arm-soc: cleanups, part 2 2012-05-26 12:31:49 -07:00
cpu.h arm-soc: new SoC support 2012-07-23 16:31:31 -07:00
dma-44xx.h
dma.h arm-soc: cleanups, part 2 2012-05-26 12:31:49 -07:00
dmtimer.h ARM: OMAP2+: Move dmtimer clock set function to dmtimer driver 2012-06-14 02:39:47 -07:00
dsp.h ARM: OMAP: dsp: interface to control module functions 2012-06-18 16:18:10 -06:00
flash.h OMAP: fix compilation error 2011-05-31 06:17:01 -07:00
fpga.h arm: omap1: fix compile warnings 2011-01-27 16:39:41 -08:00
gpio-switch.h
gpio.h gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume() 2012-05-11 17:08:40 -07:00
gpmc-smc91x.h
gpmc-smsc911x.h arm: omap: gpmc-smsc911x: minor style fixes 2011-05-03 00:38:58 -07:00
gpmc.h ARM: OMAP3: gpmc: add BCH ecc api and modes 2012-05-13 23:25:42 -05:00
hardware.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
hdq1w.h ARM: OMAP2+: HDQ1W: add custom reset function 2012-05-08 17:25:36 -06:00
i2c.h OMAP: hwmod: fix the i2c-reset timeout during bootup 2011-07-10 05:27:16 -06:00
iommu.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
iommu2.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iopgtable.h omap: iommu: omapify 'struct iommu' and exposed API 2011-08-26 11:46:01 +02:00
iovmm.h iommu/omap: eliminate the public omap_find_iommu_device() method 2011-12-05 15:47:39 +02:00
irda.h
irqs-44xx.h
irqs.h ARM: OMAP: irqs: Fix NR_IRQS value to handle PRCM interrupts 2012-02-28 15:49:54 -08:00
keypad.h ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers 2012-02-24 10:34:36 -08:00
l3_2xxx.h OMAP2420: hwmod data: add DSS DISPC RFBI VENC 2011-02-23 09:19:06 +02:00
l3_3xxx.h OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC 2011-02-23 09:19:06 +02:00
l4_2xxx.h OMAP2420: hwmod data: add DSS DISPC RFBI VENC 2011-02-23 09:19:06 +02:00
l4_3xxx.h OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC 2011-02-23 09:19:06 +02:00
lcd_mipid.h
led.h
mailbox.h
mcbsp.h ARM/ASoC: OMAP McBSP: Move remainig defines from arch to ASoC header 2012-03-12 13:34:23 +00:00
mcspi.h ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config 2012-02-24 10:33:58 -08:00
menelaus.h
mmc.h ARM: omap: remove mmc platform data dma_mask and initialization 2012-07-31 12:06:23 +01:00
multi.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
mux.h ARM: OMAP7XX: Remove omap730.h and omap850.h 2012-06-28 00:08:10 -07:00
nand.h omap: cleanup NAND platform data 2011-06-29 01:11:37 -07:00
omap_device.h ARM: OMAP: omap_device: remove omap_device_parent 2012-03-05 15:38:02 -08:00
omap_hwmod.h ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API 2012-07-06 00:58:43 -07:00
omap-pm.h ARM: OMAP: change get_context_loss_count ret value to int 2011-11-04 17:41:07 -07:00
omap-secure.h ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak 2012-07-09 19:14:38 +05:30
omap-serial.h OMAP2+: UART: Remove cpu checks for populating errata flags 2012-04-18 15:07:05 -07:00
omap4-keypad.h Input: omap4-keypad - move platform_data to <linux/platform_data> 2012-03-16 22:49:46 -07:00
omap7xx.h
omap16xx.h
omap24xx.h
omap34xx.h ARM: OMAP: am33xx: Update common OMAP machine specific sources 2011-12-13 10:46:43 -08:00
omap44xx.h ARM: OMAP4: PM: Add SAR RAM support 2011-12-08 11:28:59 -08:00
omap54xx.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
omap1510.h
onenand.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1 2011-03-25 17:41:20 +02:00
param.h
prcm.h ARM: OMAP: Allow platforms to hook reset cleanly 2011-01-27 16:39:48 -08:00
remoteproc.h remoteproc/omap: add a remoteproc driver for OMAP4 2012-02-08 22:53:47 +02:00
sdrc.h ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds 2012-07-09 01:44:11 -07:00
serial.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
sram.h ARM: OMAP: sram: Add am33xx SRAM support (minimal) 2012-03-05 16:11:01 -08:00
tc.h ARM: OMAP: Remove plat/io.h by splitting it into mach/io.h and mach/hardware.h 2012-02-24 10:34:35 -08:00
ti81xx.h ARM: OMAP: TI81XX: Prepare for addition of TI814X support 2011-12-13 10:46:44 -08:00
timex.h
uncompress.h ARM: OMAP5: Add minimal support for OMAP5430 SOC 2012-07-09 19:14:39 +05:30
usb.h ARM: OMAP: Make FS USB omap1 only 2012-06-04 00:57:57 -07:00
voltage.h ARM: OMAP2+: Voltage: Move the omap_volt_data structure to plat 2012-05-31 16:03:44 -07:00
vram.h OMAPDSS: Remove video SRAM support 2012-02-23 09:38:26 +02:00
vrfb.h