diff options
| author | Vinod Koul <vkoul@kernel.org> | 2019-03-12 12:04:09 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2019-03-12 12:04:09 +0530 |
| commit | 989e3af3af27a6cc486b64b21628a07fa021ebe9 (patch) | |
| tree | b3ad3bf911a16a178496811781eb63bc56506377 /Documentation | |
| parent | 84054481eef63286a725962574f75782f6b5c209 (diff) | |
| parent | c4994a98faf2797d8977c0d075222962d71c4112 (diff) | |
| download | lwn-989e3af3af27a6cc486b64b21628a07fa021ebe9.tar.gz lwn-989e3af3af27a6cc486b64b21628a07fa021ebe9.zip | |
Merge branch 'topic/k3dma' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/dma.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/dma/k3dma.txt | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/dma/dma.txt b/Documentation/devicetree/bindings/dma/dma.txt index 6312fb00ce8d..eeb4e4d1771e 100644 --- a/Documentation/devicetree/bindings/dma/dma.txt +++ b/Documentation/devicetree/bindings/dma/dma.txt @@ -16,6 +16,9 @@ Optional properties: - dma-channels: Number of DMA channels supported by the controller. - dma-requests: Number of DMA request signals supported by the controller. +- dma-channel-mask: Bitmask of available DMA channels in ascending order + that are not reserved by firmware and are available to + the kernel. i.e. first channel corresponds to LSB. Example: @@ -29,6 +32,7 @@ Example: #dma-cells = <1>; dma-channels = <32>; dma-requests = <127>; + dma-channel-mask = <0xfffe> }; * DMA router diff --git a/Documentation/devicetree/bindings/dma/k3dma.txt b/Documentation/devicetree/bindings/dma/k3dma.txt index 4945aeac4dc4..10a2f15b08a3 100644 --- a/Documentation/devicetree/bindings/dma/k3dma.txt +++ b/Documentation/devicetree/bindings/dma/k3dma.txt @@ -3,7 +3,9 @@ See dma.txt first Required properties: -- compatible: Should be "hisilicon,k3-dma-1.0" +- compatible: Must be one of +- "hisilicon,k3-dma-1.0" +- "hisilicon,hisi-pcm-asp-dma-1.0" - reg: Should contain DMA registers location and length. - interrupts: Should contain one interrupt shared by all channel - #dma-cells: see dma.txt, should be 1, para number |