openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/arch/arm/plat-mxc/include/mach
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
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux.h MX51: Add AUDMUX ports definitions 2011-03-23 15:08:13 +01:00
board-mx31ads.h Fixing ethernet driver compilation error for i.MX31 ADS board 2010-10-19 18:45:01 +02:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clock.h arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block 2010-02-24 10:07:03 +01:00
common.h power management changes for omap and imx 2012-01-09 14:39:59 -08:00
debug-macro.S Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:34:22 -07:00
devices-common.h Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
dma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
entry-macro.S ARM: imx: convert smp platforms to global gic_handle_irq() 2011-11-15 18:13:59 +00:00
esdhc.h mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5 2011-07-27 09:31:14 +08:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h Merge branch 'highbank/soc' into next/soc 2011-11-02 02:46:10 +01:00
hardware.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
i2c.h i2c-imx: remove init/exit hooks from platform data 2011-09-14 22:14:41 +01:00
iim.h
…
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h arm/imx: remove cpu_is_xxx() check from __imx_ioremap() 2011-10-04 10:55:12 +02:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h mx2/iomux: Set direction for CSPI2 pins 2011-03-25 08:21:34 +01:00
iomux-mx3.h mx31moboard: Add poweroff support 2011-09-20 14:53:00 +02:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h iomux-mx25: configuration to support CSPI3 on CSI pins 2012-01-03 09:47:14 +01:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h ARM: imx35: fix ATA_DATA3 pad control address 2011-03-07 19:29:09 +01:00
iomux-mx50.h ARM: imx50: correct iomux-mx50.h wrong daisy chain settings 2011-02-18 11:01:34 +01:00
iomux-mx51.h ARM: i.MX51: clean up iomux-mx51.h 2011-08-17 08:41:23 +02:00
iomux-mx53.h ARM: i.MX53: clean up iomux-mx53.h 2011-08-17 08:43:32 +02:00
iomux-v1.h ARM i.MX: get rid of wrong MXC_INTERNAL_IRQ usage 2011-07-07 10:00:00 +02:00
iomux-v3.h Merge branch 'next/fixes' into next/cleanup 2011-10-31 23:25:41 +01:00
ipu.h i.MX31: Image Processing Unit DMA and IRQ drivers 2009-01-19 15:36:21 -07:00
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1.h ARM: plat-mxc: remove inclusion of <mach/vmalloc.h> 2011-11-15 22:30:39 -05:00
mx1_camera.h V4L/DVB (11350): Add camera (CSI) driver for MX1 2009-04-06 21:43:58 -03:00
mx2_cam.h mx2_camera: Add soc_camera support for i.MX25/i.MX27 2010-07-28 09:28:36 +02:00
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h video i.MX IPU: Fix display connections 2011-12-08 12:59:03 +05:30
mx3x.h ARM: mx35: use generic function for displaying silicon revision 2011-08-26 08:50:59 +02:00
mx6q.h arm/imx6q: add core definitions and low-level debug uart 2011-10-31 14:26:21 +01:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features 2011-09-29 10:40:29 +02:00
mx27.h arm/imx: remove mx27_setup_weimcs() from mx27.h 2011-10-17 21:41:03 +02:00
mx31.h arm/imx: remove mx31_setup_weimcs() from mx31.h 2011-10-17 21:41:03 +02:00
mx35.h ARM: imx: Add PATA resources for other i.MX processors 2011-08-24 10:11:40 +02:00
mx50.h ARM: mx50: Add support to get the silicon revision 2011-03-23 15:08:15 +01:00
mx51.h Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup 2011-09-20 10:09:08 +02:00
mx53.h ARM: mx5/mm: consolidate TZIC map code 2011-09-20 09:55:06 +02:00
mxc.h ARM: mx5: use generic irq chip pm interface for pm functions on 2011-12-25 12:02:28 +08:00
mxc_ehci.h ARM i.MX ehci: do ehci init in board specific functions 2011-02-11 08:40:45 +01:00
mxc_nand.h Fix common misspellings 2011-03-31 11:26:23 -03:00
sdma.h dmaengine: imx-sdma: use platform_device_id to identify sdma version 2011-07-27 09:31:45 +08:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
system.h ARM: restart: remove the now empty arch_reset() 2012-01-05 12:57:22 +00:00
timex.h ARM i.MX: define CLOCK_TICK_RATE to bogus value 2011-07-07 09:59:58 +02:00
ulpi.h ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers 2011-03-07 19:29:41 +01:00
uncompress.h enable uncompress log on cpuimx35sd 2011-12-19 12:26:09 +01:00
usb.h imx: exit functions can/should be void 2009-05-07 16:15:58 +02:00