diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 16:22:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 16:22:20 -0700 |
| commit | 6307e418251240c2d18b3d69b96e50176c51a113 (patch) | |
| tree | 425dd6e83c560d05afdbd5578da5003a117a20dc /arch/arm/plat-samsung/include/plat | |
| parent | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (diff) | |
| parent | efd9960b0e1bdfe48490504a8166ffdbcc466dba (diff) | |
| download | op-kernel-dev-6307e418251240c2d18b3d69b96e50176c51a113.zip op-kernel-dev-6307e418251240c2d18b3d69b96e50176c51a113.tar.gz | |
Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
ARM: EXYNOS: Enable MDMA driver
(includes dependent base of samsung/cleanup-exynos-clock)
Diffstat (limited to 'arch/arm/plat-samsung/include/plat')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-pl330.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index c5eaad5..0670f37 100644 --- a/arch/arm/plat-samsung/include/plat/dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h @@ -82,6 +82,22 @@ enum dma_ch { DMACH_SLIMBUS4_TX, DMACH_SLIMBUS5_RX, DMACH_SLIMBUS5_TX, + DMACH_MIPI_HSI0, + DMACH_MIPI_HSI1, + DMACH_MIPI_HSI2, + DMACH_MIPI_HSI3, + DMACH_MIPI_HSI4, + DMACH_MIPI_HSI5, + DMACH_MIPI_HSI6, + DMACH_MIPI_HSI7, + DMACH_MTOM_0, + DMACH_MTOM_1, + DMACH_MTOM_2, + DMACH_MTOM_3, + DMACH_MTOM_4, + DMACH_MTOM_5, + DMACH_MTOM_6, + DMACH_MTOM_7, /* END Marker, also used to denote a reserved channel */ DMACH_MAX, }; |
