Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 12:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
ef08e78268
linux/arch/arm
History
Linus Torvalds ef08e78268 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 
Pull slave-dmaengine update from Vinod Koul:
 "This includes the cookie cleanup by Russell, the addition of context
  parameter for dmaengine APIs, more arm dmaengine driver cleanup by
  moving code to dmaengine, this time for imx by Javier and pl330 by
  Boojin along with the usual driver fixes."

Fix up some fairly trivial conflicts with various other cleanups.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (67 commits)
  dmaengine: imx: fix the build failure on x86_64
  dmaengine: i.MX: Fix merge of cookie branch.
  dmaengine: i.MX: Add support for interleaved transfers.
  dmaengine: imx-dma: use 'dev_dbg' and 'dev_warn' for messages.
  dmaengine: imx-dma: remove 'imx_dmav1_baseaddr' and 'dma_clk'.
  dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
  dmaengine: imx-dma: remove internal structure.
  dmaengine: imx-dma: remove 'resbytes' field of 'internal' structure.
  dmaengine: imx-dma: remove 'in_use' field of 'internal' structure.
  dmaengine: imx-dma: remove sg member from internal structure.
  dmaengine: imx-dma: remove 'imxdma_setup_sg_hw' function.
  dmaengine: imx-dma: remove 'imxdma_config_channel_hw' function.
  dmaengine: imx-dma: remove 'imxdma_setup_mem2mem_hw' function.
  dmaengine: imx-dma: remove dma_mode member of internal structure.
  dmaengine: imx-dma: remove data member from internal structure.
  dmaengine: imx-dma: merge old dma-v1.c with imx-dma.c
  dmaengine: at_hdmac: add slave config operation
  dmaengine: add context parameter to prep_slave_sg and prep_dma_cyclic
  dmaengine/dma_slave: introduce inline wrappers
  dma: imx-sdma: Treat firmware messages as warnings instead of erros
  ...
2012-03-29 15:34:57 -07:00
..
boot ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
common Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
configs ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
include/asm Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
kernel Merge branch 'akpm' (Andrew's patch-bomb) 2012-03-28 17:19:28 -07:00
lib ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts 2012-01-25 11:07:40 +00:00
mach-at91 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
mach-bcmring Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-clps711x Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-cns3xxx Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-davinci Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-dove Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-ebsa110 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-ep93xx Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards 2012-03-27 15:18:19 -07:00
mach-exynos MMC highlights for 3.4: 2012-03-28 20:59:45 -07:00
mach-footbridge Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-gemini Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-h720x Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-highbank ARM: SoC specific updates 2012-03-27 16:14:44 -07:00
mach-imx Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
mach-integrator Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-iop13xx Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-iop32x Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-iop33x Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-ixp4xx Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-ixp23xx Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-ixp2000 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-kirkwood ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
mach-ks8695 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-l7200/include/mach
mach-lpc32xx ARM: More SoC driver updates 2012-03-28 12:17:06 -07:00
mach-mmp Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-msm Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-mv78xx0 Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-mxs Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-netx Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-nomadik Merge branch 'tegra/cleanups' into next/timer 2012-03-21 14:27:34 +00:00
mach-omap1 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-omap2 MMC highlights for 3.4: 2012-03-28 20:59:45 -07:00
mach-orion5x Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-picoxcell Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-pnx4008 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-prima2 Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-pxa Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-realview Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-rpc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-s3c24xx Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-s3c64xx Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-s3c2410 Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mach-s3c2412 Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mach-s3c2440 Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
mach-s5p64x0 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-s5pc100 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-s5pv210 ARM: board specific updates 2012-03-27 16:27:28 -07:00
mach-sa1100 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-shark Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-shmobile Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-spear3xx Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm 2012-03-23 17:30:49 -07:00
mach-spear6xx ARM: More device tree support updates 2012-03-28 12:34:33 -07:00
mach-tegra Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-u300 Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers 2012-03-24 11:29:58 +00:00
mach-ux500 MFD changes for 3.4 2012-03-28 13:56:35 -07:00
mach-versatile Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-vexpress Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-vt8500 Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mach-w90x900 Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
mach-zynq Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc 2012-02-22 22:04:41 +00:00
mm Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
nwfpe Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
oprofile oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue 2011-12-23 11:58:34 +01:00
plat-iop Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
plat-mxc Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
plat-nomadik Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
plat-omap MMC highlights for 3.4: 2012-03-28 20:59:45 -07:00
plat-orion ARM: orion: wdt: use resource vice direct access 2012-03-16 04:28:41 +00:00
plat-pxa Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
plat-s3c24xx Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
plat-s5p Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
plat-samsung Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
plat-spear Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
plat-versatile ARM: plat-versatile: convert to twd_local_timer_register() interface 2012-03-13 13:29:58 +00:00
tools ARM: Update mach-types 2011-12-23 22:58:10 +00:00
vfp Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
Kconfig ARM: Non-critical bug fixes 2012-03-27 21:24:03 -07:00
Kconfig-nommu
Kconfig.debug Merge branch 'imx/driver' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/drivers 2012-02-28 12:23:27 +00:00
Makefile ARM: More SoC support updates 2012-03-28 12:24:40 -07:00