projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
[cascardo/linux.git]
/
include
/
linux
/
platform_data
/
dma-imx.h
diff --git
a/include/linux/platform_data/dma-imx.h
b/include/linux/platform_data/dma-imx.h
index
d05542a
..
6a1357d
100644
(file)
--- a/
include/linux/platform_data/dma-imx.h
+++ b/
include/linux/platform_data/dma-imx.h
@@
-40,6
+40,7
@@
enum sdma_peripheral_type {
IMX_DMATYPE_ASRC, /* ASRC */
IMX_DMATYPE_ESAI, /* ESAI */
IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */
+ IMX_DMATYPE_ASRC_SP, /* Shared ASRC */
};
enum imx_dma_prio {