leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1ac02d7958
linux/arch/arm/plat-samsung
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
..
include/plat ARM: More SoC support updates 2012-03-28 12:24:40 -07:00
adc.c ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450 2011-10-14 15:15:42 +09:00
clock-clksrc.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
clock.c ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable} 2012-02-12 01:03:02 +09:00
cpu.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
dev-backlight.c ARM: SAMSUNG: Add __init attribute to samsung_bl_set() 2012-03-09 08:03:13 -08:00
dev-uart.c
devs.c Merge branch 'renesas/soc' into next/soc2 2012-03-24 19:13:59 +00:00
dma-ops.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-03-29 15:34:57 -07:00
dma.c ARM: SAMSUNG: DMA Cleanup as per sparse 2011-07-16 15:50:19 +09:00
init.c ARM: SAMSUNG: Add support for handling of cpu revision 2011-08-24 19:25:19 +09:00
irq-vic-timer.c ARM: EXYNOS: add interrupt definitions for EXYNOS5250 2012-03-14 02:35:04 -07:00
Kconfig ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX 2012-03-03 07:44:51 +09:00
Makefile Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc 2011-11-05 18:18:05 -07:00
pd.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
platformdata.c ARM: SAMSUNG: support the second capability for samsung-soc 2012-03-10 23:40:28 -08:00
pm-check.c
pm-gpio.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
pm.c ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
pwm-clock.c ARM: SAMSUNG: Consolidate plat/pwm-clock.h 2011-10-04 19:48:41 +09:00
pwm.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
s3c-dma-ops.c arm: Add export.h to recently added files for EXPORT_SYMBOL 2011-11-07 10:28:58 -08:00
time.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00