]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 21 Sep 2012 02:57:38 +0000 (19:57 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 21 Sep 2012 02:57:38 +0000 (19:57 -0700)
commit32dec75349da4e68b53f099ce3a96469cdc334d6
tree96aca7914b07697668ec716a3f80fb8c82e7a971
parent740418ef19fd7def7b9c333435d4ca1dce28cc42
parent9891e3240543c45176b1298164418b61e8909ed0
Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

ARM: tegra: switch to dmaengine

The Tegra code-base has contained both a legacy DMA and a dmaengine
driver since v3.6-rcX. This series flips Tegra's defconfig to enable
dmaengine rather than the legacy driver, and removes the legacy driver
and all client code.

* tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ASoC: tegra: remove support of legacy DMA driver based access
  spi: tegra: remove support of legacy DMA driver based access
  ARM: tegra: apbio: remove support of legacy DMA driver based access
  ARM: tegra: dma: remove legacy APB DMA driver
  ARM: tegra: config: enable dmaengine based APB DMA driver
  + sync to 3.6-rc6
20 files changed:
MAINTAINERS
arch/arm/Makefile
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/apbio.c
arch/arm/mm/mmu.c
arch/arm/plat-omap/sram.c
drivers/i2c/busses/Kconfig
drivers/mfd/tps6586x.c
drivers/tty/serial/imx.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c
sound/soc/omap/am3517evm.c