p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/arch/arm/mach-ep93xx
History
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
 		2012-01-17 18:40:24 -08:00
..
include/mach Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
Kconfig ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
adssphere.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
core.c ARM: restart: ep93xx: use new restart hook 2012-01-05 12:57:10 +00:00
dma.c ep93xx: add dmaengine platform code 2011-06-08 15:45:52 -06:00
edb93xx.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
gesbc9312.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
micro9.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
simone.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
snappercl15.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
ts72xx.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
vision_ep9307.c ARM: restart: ep93xx: use new restart hook 2012-01-05 12:57:10 +00:00