diff options
-rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 | ||||
-rw-r--r-- | drivers/dma/imx-sdma.c | 1 | ||||
-rw-r--r-- | include/linux/platform_data/dma-imx.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index 4659fd952301..dc8d3aac1aa9 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | |||
@@ -48,6 +48,7 @@ The full ID of peripheral types can be found below. | |||
48 | 21 ESAI | 48 | 21 ESAI |
49 | 22 SSI Dual FIFO (needs firmware ver >= 2) | 49 | 22 SSI Dual FIFO (needs firmware ver >= 2) |
50 | 23 Shared ASRC | 50 | 23 Shared ASRC |
51 | 24 SAI | ||
51 | 52 | ||
52 | The third cell specifies the transfer priority as below. | 53 | The third cell specifies the transfer priority as below. |
53 | 54 | ||
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 99d8833edbd6..5b38f2bbd42a 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -729,6 +729,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, | |||
729 | case IMX_DMATYPE_CSPI: | 729 | case IMX_DMATYPE_CSPI: |
730 | case IMX_DMATYPE_EXT: | 730 | case IMX_DMATYPE_EXT: |
731 | case IMX_DMATYPE_SSI: | 731 | case IMX_DMATYPE_SSI: |
732 | case IMX_DMATYPE_SAI: | ||
732 | per_2_emi = sdma->script_addrs->app_2_mcu_addr; | 733 | per_2_emi = sdma->script_addrs->app_2_mcu_addr; |
733 | emi_2_per = sdma->script_addrs->mcu_2_app_addr; | 734 | emi_2_per = sdma->script_addrs->mcu_2_app_addr; |
734 | break; | 735 | break; |
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 6a1357d31871..7d964e787299 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h | |||
@@ -41,6 +41,7 @@ enum sdma_peripheral_type { | |||
41 | IMX_DMATYPE_ESAI, /* ESAI */ | 41 | IMX_DMATYPE_ESAI, /* ESAI */ |
42 | IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ | 42 | IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ |
43 | IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ | 43 | IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ |
44 | IMX_DMATYPE_SAI, /* SAI */ | ||
44 | }; | 45 | }; |
45 | 46 | ||
46 | enum imx_dma_prio { | 47 | enum imx_dma_prio { |