OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-shmobile
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 ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
Kconfig Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest 2012-01-10 17:10:55 +09:00
Makefile ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
board-ag5evm.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
board-ap4evb.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
board-bonito.c ARM: mach-shmobile: bonito: add SMSC9221 support 2011-11-11 16:56:35 +09:00
board-g3evm.c ARM: mach-shmobile: use standard 2MiB coherent DMA memory size 2012-01-02 23:13:54 -05:00
board-g4evm.c ARM: mach-shmobile: use standard 2MiB coherent DMA memory size 2012-01-02 23:13:54 -05:00
board-kota2.c Merge branch 'devel-stable' into for-linus 2012-01-05 13:24:33 +00:00
board-mackerel.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
board-marzen.c ARM: mach-shmobile: Fix up marzen build for recent GIC changes. 2012-01-10 13:33:23 +09:00
clock-r8a7740.c ARM: mach-shmobile: bonito: Add LCDC0 support 2011-11-11 16:56:32 +09:00
clock-r8a7779.c ARM: mach-shmobile: clock-r8a7779: clkz/clkzs support 2012-01-09 10:24:16 +09:00
clock-sh73a0.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
clock-sh7367.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock-sh7372.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
clock-sh7377.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
console.c ARM: mach-shmobile: early console support using earlyprintk 2010-02-09 10:34:12 +09:00
cpuidle.c ARM: mach-shmobile: cpuidle single/global and last_state fixes 2011-11-11 16:49:28 +09:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT 2012-01-09 10:36:48 +09:00
hotplug.c ARM: mach-shmobile: Flush caches in platform_cpu_die() 2012-01-09 10:37:29 +09:00
intc-r8a7740.c ARM: mach-shmobile: r8a7740: add INTC support 2011-11-11 16:55:37 +09:00
intc-r8a7779.c ARM: mach-shmobile: r8a7779 and Marzen base support V2 2012-01-09 10:13:59 +09:00
intc-sh73a0.c ARM: mach-shmobile: sh73a0 and AG5EVM PINT support 2011-11-05 01:03:55 +09:00
intc-sh7367.c ARM: mach-shmobile: Use common INTC IRQ code on sh7367 2011-11-05 01:01:50 +09:00
intc-sh7372.c PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume 2011-12-25 23:39:11 +01:00
intc-sh7377.c ARM: mach-shmobile: Use common INTC IRQ code on sh7377 2011-11-05 01:01:50 +09:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
pfc-r8a7740.c ARM: mach-shmobile: r8a7740: add PFC support. 2011-11-11 16:55:33 +09:00
pfc-r8a7779.c ARM: mach-shmobile: r8a7779 PFC function support 2012-01-10 13:29:37 +09:00
pfc-sh73a0.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7367.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7372.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
pfc-sh7377.c ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h 2011-11-11 16:45:35 +09:00
platsmp.c ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
pm-r8a7779.c ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
pm-sh7372.c PM / shmobile: fix A3SP suspend method 2012-01-14 00:40:14 +01:00
setup-r8a7740.c ARM: mach-shmobile: r8a7740: add INTC support 2011-11-11 16:55:37 +09:00
setup-r8a7779.c ARM: mach-shmobile: r8a7779 power domain support V2 2012-01-10 16:44:19 +09:00
setup-sh73a0.c arm: mach-shmobile: add a resource name for shdma 2012-01-12 12:20:09 +09:00
setup-sh7367.c ARM: mach-shmobile: Correct SCIF port types for SH7367. 2011-06-14 15:12:09 +09:00
setup-sh7372.c Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-01-17 18:40:24 -08:00
setup-sh7377.c ARM: mach-shmobile: sh7377 UIO platform data V3 2011-05-24 12:19:30 +09:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-r8a7779.c ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
smp-sh73a0.c ARM: shmobile: convert logical CPU numbers to physical numbers 2011-10-17 10:01:11 +01:00
suspend.c ARM: mach-shmobile: Suspend-to-RAM support 2011-05-25 11:19:17 +09:00
timer.c ARM: mach-shmobile: SH-Mobile G3 support. 2010-02-08 12:44:11 +09:00