diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 14:59:20 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2021-11-30 14:59:20 +0800 |
| commit | ac116b73a29ed71dbd700a6984136f1a86abf632 (patch) | |
| tree | 62468f32806b13e4886cd456b36ba1a1abce9697 /Documentation/devicetree/bindings/dma | |
| parent | bc5739460bec0cd0ee3ea2480051b4600868b6b2 (diff) | |
| parent | 6d497fa7bd45351f3c1a216a7191a8a6fe904bc4 (diff) | |
Merge remote-tracking branch 'origin/dma/sdma' into dma/next
* origin/dma/sdma: (37 commits)
LF-4435: dmaengine: imx-sdma: fix kernel dump during MP3 decoding
dmaengine: imx-sdma: add back i.mx6sx compatible name
LF-3941: dmaengine: imx-sdma: fix audio noise with multi-fifo script
MLK-17285 dma: imx-sdma: fix sound mute in high loading
MLK-25508: dmaengine: imx-sdma: fix kernel dump in audio record
...
Diffstat (limited to 'Documentation/devicetree/bindings/dma')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index 12c316ff4834..e7b5f734a2d8 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -9,6 +9,7 @@ Required properties: "fsl,imx53-sdma" "fsl,imx6q-sdma" "fsl,imx7d-sdma" + "fsl,imx6sx-sdma" "fsl,imx6ul-sdma" "fsl,imx8mq-sdma" "fsl,imx8mm-sdma" @@ -55,6 +56,7 @@ The full ID of peripheral types can be found below. 22 SSI Dual FIFO (needs firmware ver >= 2) 23 Shared ASRC 24 SAI + 25 HDMI Audio The third cell specifies the transfer priority as below. |