summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-07-13 15:22:43 +0900
committerKukjin Kim <kgene.kim@samsung.com>2012-07-13 15:23:42 +0900
commite9f9c8262a85bfe5ab657b38b8c0132c86c3722e (patch)
tree4f50d3fd297054317cc8936ed557c7592e54b0a4
parent4d3c463634ba5d0c0f053013cd947721e5e42393 (diff)
downloadop-kernel-dev-e9f9c8262a85bfe5ab657b38b8c0132c86c3722e.zip
op-kernel-dev-e9f9c8262a85bfe5ab657b38b8c0132c86c3722e.tar.gz
ARM: S3C64XX: Add a new dma request id for device tree based dma channel lookup
Commit 4972a80e16a2 (ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers) introduced a new member 'dt_dmach_prop' in the struct samsung_dma_info which is used to specify the dma channel number property as obtained from the device tree. It also introduced a new dma request id 'DMACH_DT_PROP' to indicate that a device tree node property represting the dma channel is available in 'struct samsung_dma_info'. Add dma request id 'DMACH_DT_PROP' in s3c64xx dma channel id list in order to maintain compatibility to the changes in the Samsung dma wrappper operations. Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/include/mach/dma.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/dma.h b/arch/arm/mach-s3c64xx/include/mach/dma.h
index fe1a98c..57b1ff4 100644
--- a/arch/arm/mach-s3c64xx/include/mach/dma.h
+++ b/arch/arm/mach-s3c64xx/include/mach/dma.h
@@ -21,6 +21,7 @@
*/
enum dma_ch {
/* DMA0/SDMA0 */
+ DMACH_DT_PROP = -1, /* not yet supported, do not use */
DMACH_UART0 = 0,
DMACH_UART0_SRC2,
DMACH_UART1,
OpenPOWER on IntegriCloud