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-soc: new SoC support	2012-07-23 16:31:31 -07:00
am35xx-emac.c	ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support	2012-06-27 14:59:57 -06:00
am35xx-emac.h
board-2430sdp.c	arm-soc: general cleanups	2012-07-23 16:04:15 -07:00
board-3430sdp.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-3630sdp.c
board-4430sdp.c	ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2	2012-07-09 05:07:17 -07:00
board-am3517crane.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-am3517evm.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-apollon.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
board-cm-t35.c	ARM: OMAP3: cm-t35: add tvp5150 decoder support	2012-07-02 04:09:06 -07:00
board-cm-t3517.c
board-devkit8000.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-flash.c	ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n	2012-06-26 03:29:57 -07:00
board-flash.h
board-generic.c	ARM: OMAP5: board-generic: Add device tree support	2012-07-09 19:14:39 +05:30
board-h4.c	ARM: OMAP2: Remove legacy USB FS support	2012-06-04 00:57:22 -07:00
board-igep0020.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-ldp.c
board-n8x0.c	ARM: omap: remove mmc platform data dma_mask and initialization	2012-07-31 12:06:23 +01:00
board-omap3beagle.c	Some OMAP AM35xx fixes.	2012-06-29 06:07:08 -07:00
board-omap3evm.c	ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support	2012-07-09 23:22:24 -07:00
board-omap3logic.c	ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end	2012-06-19 15:24:34 -07:00
board-omap3pandora.c
board-omap3stalker.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-omap3touchbook.c
board-omap4panda.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
board-overo.c	ARM: OMAP2: Overo: init I2C before MMC to fix MMC suspend/resume failure	2012-07-02 04:58:47 -07:00
board-rm680.c
board-rx51-peripherals.c	ARM: OMAP: Fix lis3lv02d accelerometer to use gpio_to_irq	2012-06-04 02:41:54 -07:00
board-rx51-video.c
board-rx51.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
board-ti8168evm.c
board-zoom-debugboard.c
board-zoom-display.c
board-zoom-peripherals.c
board-zoom.c
clkt2xxx_apll.c
clkt2xxx_dpll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clkt_iclk.c
clock.c	ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c	2012-07-05 08:05:15 -07:00
clock.h	ARM: OMAP3+: clock33xx: Add AM33XX clock tree data	2012-06-29 16:16:40 -06:00
clock2xxx.c
clock2xxx.h
clock3xxx.c
clock3xxx.h
clock3xxx_data.c	USB patches for 3.6-rc1	2012-07-26 10:23:47 -07:00
clock33xx_data.c	OMAP AM33xx clock data	2012-07-05 08:18:04 -07:00
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx.h
clock44xx_data.c	This branch adds clock data for am33xx. Note that eventually these	2012-07-10 17:41:13 +02:00
clock2420_data.c	arm-soc: timer updates	2012-07-23 16:21:23 -07:00
clock2430.c
clock2430_data.c	arm-soc: timer updates	2012-07-23 16:21:23 -07:00
clock3517.c
clock3517.h
clock_common_data.c	ARM: OMAP3+: clock: Move common clksel_rate & clock data to common file	2012-06-26 20:57:22 -06:00
clockdomain.c
clockdomain.h	arm-soc: soc-specific updates	2012-07-23 16:08:40 -07:00
clockdomain2xxx_3xxx.c
clockdomain33xx.c	ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations	2012-06-18 12:08:06 -06:00
clockdomain44xx.c	ARM: OMAP4: clockdomain/CM code: Update supported transition modes	2012-07-04 03:45:53 -06:00
clockdomains2xxx_3xxx_data.c	ARM: OMAP2+: hwmod code/clockdomain data: fix 32K sync timer	2012-07-05 17:25:38 -07:00
clockdomains3xxx_data.c	arm-soc: general cleanups	2012-07-23 16:04:15 -07:00
clockdomains33xx_data.c	ARM: OMAP AM33xx: clockdomains: Add clockdomain data and respective operations	2012-06-18 12:08:06 -06:00
clockdomains44xx_data.c	arm-soc: general cleanups	2012-07-23 16:04:15 -07:00
clockdomains2420_data.c	ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain	2012-06-19 15:01:02 -06:00
clockdomains2430_data.c	ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain	2012-06-19 15:01:02 -06:00
cm-regbits-24xx.h
cm-regbits-33xx.h	ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details	2012-06-18 12:08:06 -06:00
cm-regbits-34xx.h	ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data	2012-06-27 14:53:46 -06:00
cm-regbits-44xx.h
cm.h	ARM: OMAP2+: CM: increase the module disable timeout	2012-06-21 18:08:47 -06:00
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm33xx.c	ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details	2012-06-18 12:08:06 -06:00
cm33xx.h	ARM: OMAP AM33xx: CM: Introduce AM33xx CM APIs and register level details	2012-06-18 12:08:06 -06:00
cm44xx.c
cm44xx.h
cminst44xx.c	ARM: OMAP4: clockdomain/CM code: Update supported transition modes	2012-07-04 03:45:53 -06:00
cminst44xx.h	ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak	2012-07-04 05:04:00 -06:00
common-board-devices.c	arm-soc: board specific updates	2012-07-23 17:34:48 -07:00
common-board-devices.h	ARM: OMAP3530evm: set pendown_state and debounce time for ads7846	2012-07-06 01:37:25 -07:00
common.c	ARM: OMAP5: Add minimal support for OMAP5430 SOC	2012-07-09 19:14:39 +05:30
common.h	ARM: omap2+: board-generic: clean up the irq data from board file	2012-07-09 19:14:39 +05:30
control.c	ARM: OMAP2+: control: new APIs to configure boot address and mode	2012-06-18 16:18:09 -06:00
control.h	arm-soc: soc-specific updates	2012-07-23 16:08:40 -07:00
cpuidle34xx.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
cpuidle44xx.c	ARM: OMAP3/4: consolidate cpuidle Makefile	2012-06-19 15:22:37 -07:00
devices.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
devices.h
display.c	ARM: OMAP2PLUS: DSS: Disable LCD3 output when resetting DSS	2012-06-29 10:37:53 +03:00
display.h
dma.c
dpll3xxx.c	ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c	2012-07-05 08:05:15 -07:00
dpll44xx.c
drm.c	omap2+: add drm device	2012-07-02 04:05:57 -07:00
dsp.c	Merge branch 'cleanup-hwmod' into cleanup	2012-06-28 05:47:01 -07:00
emu.c
gpio.c
gpmc-nand.c
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c	ARM: OMAP5: gpmc: Update gpmc_init()	2012-07-09 19:14:39 +05:30
hdq1w.c	ARM: OMAP2+: HDQ1W: use omap_device	2012-06-21 21:40:38 -06:00
hsmmc.c	ARM: omap: remove mmc platform data dma_mask and initialization	2012-07-31 12:06:23 +01:00
hsmmc.h
hwspinlock.c
i2c.c
id.c	ARM: OMAP5: id: Add cpu id for ES versions	2012-07-09 19:14:39 +05:30
io.c	arm-soc: clk changes	2012-07-23 17:51:03 -07:00
iomap.h	ARM: OMAP5: Add minimal support for OMAP5430 SOC	2012-07-09 19:14:39 +05:30
iommu2.c
irq.c	arm-soc: new SoC support	2012-07-23 16:31:31 -07:00
Kconfig	arm-soc: new SoC support	2012-07-23 16:31:31 -07:00
mailbox.c	Merge branch 'fixes-omap4-dsp' into fixes-non-critical	2012-06-28 00:07:30 -07:00
Makefile	arm-soc: clk changes	2012-07-23 17:51:03 -07:00
Makefile.boot
mcbsp.c
msdi.c	ARM: OMAP2: Use hwmod to initialize mmc for 2420	2012-06-26 03:14:20 -07:00
mux.c	Some uncontroversial OMAP clock, hwmod, and compiler warning fixes for 3.5-rc	2012-06-23 16:16:29 -07:00
mux.h	OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup	2012-06-05 04:04:11 -07:00
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
omap-headsmp.S	ARM: OMAP5: Add SMP support	2012-07-09 19:14:39 +05:30
omap-hotplug.c	ARM: OMAP5: Add the WakeupGen IP updates	2012-07-09 19:14:39 +05:30
omap-iommu.c
omap-mpuss-lowpower.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
omap-secure.c
omap-smc.S
omap-smp.c	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
omap-wakeupgen.c	ARM: OMAP5: Add the WakeupGen IP updates	2012-07-09 19:14:39 +05:30
omap4-common.c	ARM: OMAP5: board-generic: Add device tree support	2012-07-09 19:14:39 +05:30
omap4-sar-layout.h	ARM: OMAP5: Add the WakeupGen IP updates	2012-07-09 19:14:39 +05:30
omap_hwmod.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
omap_hwmod_2xxx_3xxx_interconnect_data.c
omap_hwmod_2xxx_3xxx_ipblock_data.c
omap_hwmod_2xxx_interconnect_data.c
omap_hwmod_2xxx_ipblock_data.c	ARM: OMAP2+: Fix external clock support for dmtimers	2012-06-14 02:39:47 -07:00
omap_hwmod_3xxx_data.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
omap_hwmod_44xx_data.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
omap_hwmod_2420_data.c	Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6	2012-06-20 20:11:36 -06:00
omap_hwmod_2430_data.c	Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6	2012-06-20 20:11:36 -06:00
omap_hwmod_common_data.c	Merge branches 'hwmod_am335x_support_3.6', 'clkdm_pwrdm_devel_a_3.6' and 'misc_devel_3.6' into omap_devel_f_3.6	2012-07-04 06:05:51 -06:00
omap_hwmod_common_data.h
omap_l3_noc.c
omap_l3_noc.h	ARM: OMAP5: l3: Add l3 error handler support for omap5	2012-07-09 19:14:39 +05:30
omap_l3_smx.c	ARM: OMAP3: Fix omap3_l3_block_irq warning when CONFIG_BUG is not set	2012-06-06 01:42:20 -07:00
omap_l3_smx.h
omap_opp_data.h
omap_phy_internal.c	ARM: OMAP2+: Fix MUSB ifdefs for platform init code	2012-06-20 07:18:15 -07:00
omap_twl.c
opp.c	ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one	2012-06-19 15:23:29 -07:00
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
pm-debug.c
pm.c
pm.h	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
pm24xx.c	arm-soc: sweeping late_initcall cleanup	2012-05-26 13:14:01 -07:00
pm34xx.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
pm44xx.c
powerdomain-common.c
powerdomain.c	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
powerdomain.h	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
powerdomain2xxx_3xxx.c
powerdomain33xx.c	ARM: OMAP AM33xx: powerdomains: add AM335x support	2012-06-18 12:08:06 -06:00
powerdomain44xx.c
powerdomains2xxx_3xxx_data.c
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c
powerdomains3xxx_data.c	arm: omap3: am35x: Set proper powerdomain states	2012-06-28 00:12:35 -06:00
powerdomains33xx_data.c	ARM: OMAP AM33xx: powerdomains: add AM335x support	2012-06-18 12:08:06 -06:00
powerdomains44xx_data.c
prcm-common.h	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
prcm.c	ARM: OMAP5: Add minimal support for OMAP5430 SOC	2012-07-09 19:14:39 +05:30
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h
prm-regbits-24xx.h
prm-regbits-33xx.h	ARM: OMAP AM33xx: PRM: add PRM support	2012-06-18 12:08:06 -06:00
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
prm2xxx_3xxx.c	ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge	2012-06-29 07:19:52 -07:00
prm2xxx_3xxx.h	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
prm33xx.c	ARM: OMAP AM33xx: PRM: add PRM support	2012-06-18 12:08:06 -06:00
prm33xx.h	ARM: OMAP AM33xx: PRM: add PRM support	2012-06-18 12:08:06 -06:00
prm44xx.c	ARM: OMAP3+: PRM: Enable IO wake up	2012-06-22 08:40:03 -06:00
prm44xx.h	ARM: OMAP4: PRM: Add IO Daisychain support	2012-06-22 08:40:03 -06:00
prm_common.c	arm-soc: cleanups, part 2	2012-07-23 16:22:12 -07:00
prminst44xx.c
prminst44xx.h
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc.c
sdrc.h
sdrc2xxx.c
serial.c	OMAP2+: UART: Add mechanism to probe uart pins and configure rx wakeup	2012-06-05 04:04:11 -07:00
sleep24xx.S
sleep34xx.S
sleep44xx.S
smartreflex-class3.c	ARM: OMAP2+: smartreflex: Use the names from hwmod data instead of voltage domains.	2012-05-31 16:03:44 -07:00
sr_device.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
sram34xx.S
sram242x.S
sram243x.S
timer.c	arm-soc: timer updates	2012-07-23 16:21:23 -07:00
twl-common.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-07-24 13:34:56 -07:00
twl-common.h
usb-host.c
usb-musb.c	ARM: OMAP2+: Fix MUSB ifdefs for platform init code	2012-06-20 07:18:15 -07:00
usb-tusb6010.c	ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0	2012-06-20 07:18:15 -07:00
vc.c
vc.h
vc3xxx_data.c
vc44xx_data.c
voltage.c
voltage.h	arm-soc: power management changes	2012-07-23 17:43:53 -07:00
voltagedomains2xxx_data.c
voltagedomains3xxx_data.c
voltagedomains33xx_data.c	ARM: OMAP AM33xx: voltagedomain: Add voltage domain data	2012-06-18 00:47:26 -06:00
voltagedomains44xx_data.c
vp.c
vp.h
vp3xxx_data.c
vp44xx_data.c
wd_timer.c
wd_timer.h