Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
ef08e78268
linux/arch/arm/mach-at91/include/mach
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
..
at91_adc.h
at91_aic.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
at91_dbgu.h ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00
at91_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91_pio.h ARM: at91/pio: add new PIO3 features 2012-03-01 13:38:50 +01:00
at91_pit.h ARM: at91: make pit register base soc independent 2011-11-28 22:50:38 +08:00
at91_pmc.h ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
at91_ramc.h ARM: at91/pm_slowclock: add runtime detection of memory contoller 2012-02-23 14:57:56 +01:00
at91_rstc.h ARM: at91: make rstc soc independent 2012-01-20 17:22:38 +01:00
at91_rtc.h ARM: at91: make rm9200 rtc drivers soc independent 2011-11-28 22:50:39 +08:00
at91_rtt.h [ARM] 5265/3: [AT91] Add copyright info 2008-09-21 23:01:18 +01:00
at91_shdwc.h ARM: at91: add Shutdown Controller (SHDWC) DT support 2012-03-15 23:38:02 +08:00
at91_spi.h
at91_ssc.h
at91_st.h ARM: at91: make ST (System Timer) soc independent 2012-02-23 09:26:01 +01:00
at91_tc.h
at91_twi.h
at91rm9200_emac.h
at91rm9200_mc.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91rm9200_sdramc.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91rm9200.h ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
at91sam9_ddrsdr.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9_sdramc.h ARM: at91: make sdram/ddr register base soc independent 2012-02-23 14:57:56 +01:00
at91sam9_smc.h ARM: at91: add accessor to manage SMC 2012-02-13 18:31:36 +01:00
at91sam9g45_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91sam9g45.h ARM: at91/rtc-at91sam9: pass the GPBR to use via resources 2012-02-23 14:57:58 +01:00
at91sam9rl_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91sam9rl.h ARM: at91/rtc-at91sam9: pass the GPBR to use via resources 2012-02-23 14:57:58 +01:00
at91sam9x5_matrix.h ARM: at91/at91sam9x5: overall definition 2012-02-03 15:36:38 +01:00
at91sam9x5.h ARM: at91: add ram controller DT support 2012-03-15 23:37:56 +08:00
at91sam9260_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91sam9260.h ARM: at91: merge SRAM Memory banks thanks to mirroring 2012-02-23 14:57:59 +01:00
at91sam9261_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91sam9261.h ARM: at91/rtc-at91sam9: pass the GPBR to use via resources 2012-02-23 14:57:58 +01:00
at91sam9263_matrix.h ARM: at91: make matrix register base soc independent 2012-02-23 09:24:46 +01:00
at91sam9263.h ARM: at91/rtc-at91sam9: pass the GPBR to use via resources 2012-02-23 14:57:58 +01:00
at91x40.h ARM: at91/at91x40: remove use of at91_sys_read/write 2012-02-17 17:54:05 +01:00
at_hdmac.h dmaengine: at_hdmac: add slave config operation 2012-03-21 21:12:29 +05:30
atmel-mci.h atmel-mci: change use of dma slave interface 2009-12-15 08:53:35 -08:00
board.h ATMEL: fix nand ecc support 2012-03-15 23:26:32 +08:00
cpu.h ARM: at91: code removal of CAP9 SoC 2012-02-03 13:33:05 +01:00
debug-macro.S ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00
entry-macro.S ARM: remove disable_fiq and arch_ret_to_user macros 2012-02-21 17:05:18 -06:00
gpio.h ARM: at91/pio: add new PIO3 features 2012-03-01 13:38:50 +01:00
gsia18s.h AT91: Support for gsia18s board 2011-01-14 19:49:04 +01:00
hardware.h ARM: at91/PMC: make register base soc independent 2012-02-23 14:57:57 +01:00
io.h ARM: at91: finally drop at91_sys_read/write 2012-02-23 14:57:58 +01:00
irqs.h ARM: at91: make aic soc independent 2011-11-28 22:50:39 +08:00
memory.h at91: drop boot_params and PLAT_PHYS_OFFSET 2011-05-25 23:04:35 +08:00
stamp9g20.h at91: fix map_io init usage 2011-05-25 23:04:34 +08:00
system_rev.h Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
timex.h ARM: at91: define CLOCK_TICK_RATE to bogus value except A91X40 2011-11-28 22:50:37 +08:00
uncompress.h ARM: at91: make DBGU soc independent 2011-11-28 22:50:39 +08:00