Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

6391987d

Commit 6391987d authored 14 years ago by Dan Williams

Downloads
- Plain Diff

Merge branches 'dma40', 'pl08x', 'fsldma', 'imx' and 'intel-mid' into dmaengine

parents 9646b798 e8689e63 0d688662 1f1846c6 20dd6390

No related branches found

No related tags found

Loading

Changes 19

Expand all Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/mach-imx/include/mach/dma-v1.h 2 additions, 6 deletions

arch/arm/mach-imx/include/mach/dma-v1.h
arch/arm/plat-mxc/include/mach/dma.h 67 additions, 0 deletions

arch/arm/plat-mxc/include/mach/dma.h
arch/arm/plat-mxc/include/mach/sdma.h 17 additions, 0 deletions

arch/arm/plat-mxc/include/mach/sdma.h
arch/powerpc/include/asm/fsldma.h 0 additions, 137 deletions

arch/powerpc/include/asm/fsldma.h
drivers/dma/Kconfig 24 additions, 0 deletions

drivers/dma/Kconfig
drivers/dma/Makefile 3 additions, 0 deletions

drivers/dma/Makefile
drivers/dma/amba-pl08x.c 2167 additions, 0 deletions

drivers/dma/amba-pl08x.c
drivers/dma/dmaengine.c 4 additions, 0 deletions

drivers/dma/dmaengine.c
drivers/dma/fsldma.c 156 additions, 172 deletions

drivers/dma/fsldma.c
drivers/dma/imx-dma.c 422 additions, 0 deletions

drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c 1392 additions, 0 deletions

drivers/dma/imx-sdma.c
drivers/dma/intel_mid_dma.c 390 additions, 86 deletions

drivers/dma/intel_mid_dma.c
drivers/dma/intel_mid_dma_regs.h 47 additions, 6 deletions

drivers/dma/intel_mid_dma_regs.h
drivers/dma/mv_xor.c 1 addition, 1 deletion

drivers/dma/mv_xor.c
drivers/dma/shdma.c 2 additions, 1 deletion

drivers/dma/shdma.c
drivers/dma/ste_dma40.c 17 additions, 0 deletions

drivers/dma/ste_dma40.c
include/linux/amba/pl08x.h 222 additions, 0 deletions

include/linux/amba/pl08x.h
include/linux/dmaengine.h 52 additions, 2 deletions

include/linux/dmaengine.h
include/linux/intel_mid_dma.h 3 additions, 13 deletions

include/linux/intel_mid_dma.h

with 4988 additions and 424 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment