1
0
Fork 0
alistair23-linux/arch/arm/mach-s3c64xx
Linus Torvalds 5115f3c19d Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...
2013-02-26 09:24:48 -08:00
..
include/mach Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
Kconfig ARM: S3C64XX: Add missing device selects for Cragganmore 2012-11-20 20:13:58 +09:00
Makefile ARM: S3C64XX: Add usb otg phy control 2012-03-09 07:31:30 -08:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
clock.c ARM: S3C64XX: make regs-sys.h local 2013-01-10 10:45:40 -08:00
common.c irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h 2013-01-12 10:52:16 -06:00
common.h ARM: s3c64xx: use machine specific hook for late init 2012-05-08 20:36:24 +08:00
cpuidle.c ARM: S3C64XX: Fix missing header error with CONFIG_CPU_IDLE enabled 2013-01-10 10:45:41 -08:00
crag6410.h ARM: S3C64XX: make crag6410.h local 2013-01-10 10:45:38 -08:00
dev-audio.c ARM: S3C64XX: Add I2S clkdev support 2012-12-19 09:49:29 -08:00
dev-uart.c ARM: S3C64XX: Use common macro to define resources on dev-uart.c 2012-05-12 16:12:26 +09:00
dma.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2013-02-26 09:24:48 -08:00
irq-pm.c ARM: S3C64XX: use static declaration when it is not used in other files 2012-01-21 12:02:31 +09:00
mach-anw6410.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-crag6410-module.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-crag6410.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-hmt.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-mini6410.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-ncp.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-real6410.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
mach-smartq.c ARM: S3C64XX: make regs-modem.h local 2013-01-10 10:45:39 -08:00
mach-smartq.h ARM: S3C6410: Add basic support for SmartQ machines 2010-05-20 19:42:15 +09:00
mach-smartq5.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-smartq7.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-smdk6400.c Initial irqchip init infrastructure and GIC and VIC clean-ups 2013-01-14 19:55:03 -08:00
mach-smdk6410.c Merge branch 'next/cleanup-header' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2013-02-04 21:49:29 -08:00
pm.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
regs-gpio-memport.h ARM: S3C64XX: make regs-gpio-memport.h local 2013-01-10 10:45:39 -08:00
regs-modem.h ARM: S3C64XX: make regs-modem.h local 2013-01-10 10:45:39 -08:00
regs-srom.h ARM: S3C64XX: make regs-srom.h local 2013-01-10 10:45:39 -08:00
regs-sys.h ARM: S3C64XX: make regs-sys.h local 2013-01-10 10:45:40 -08:00
regs-syscon-power.h ARM: S3C64XX: make regs-syscon-power.h local 2013-01-10 10:45:40 -08:00
s3c6400.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
s3c6410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-i2c1.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-ide.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-keypad.c ARM: S3C64XX: Fix keypad setup to configure correct number of rows 2011-03-04 15:46:26 +09:00
setup-sdhci-gpio.c ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:37 +09:00
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-usb-phy.c ARM: S3C64XX: make regs-sys.h local 2013-01-10 10:45:40 -08:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00