diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2018-01-31 13:50:35 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2018-01-31 13:50:35 +0530 |
| commit | c203f677c0f6926351b26bc3fdef24236c7b8644 (patch) | |
| tree | 17c0a5dc8dba9e74a79f8cdb7e8640a9ebd88d64 /Documentation | |
| parent | c4cc2c3a24ec28323f844c8431301fd0bde2ba82 (diff) | |
| parent | b5419adcdae58dd2878460d01dfdde1ce5fa6019 (diff) | |
| download | linux-c203f677c0f6926351b26bc3fdef24236c7b8644.tar.bz2 | |
Merge branch 'topic/qcom' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt index 55492c264d17..5d93d6de57d9 100644 --- a/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt +++ b/Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt @@ -47,8 +47,8 @@ When the OS is not in control of the management interface (i.e. it's a guest), the channel nodes appear on their own, not under a management node. Required properties: -- compatible: must contain "qcom,hidma-1.0" for initial HW or "qcom,hidma-1.1" -for MSI capable HW. +- compatible: must contain "qcom,hidma-1.0" for initial HW or + "qcom,hidma-1.1"/"qcom,hidma-1.2" for MSI capable HW. - reg: Addresses for the transfer and event channel - interrupts: Should contain the event interrupt - desc-count: Number of asynchronous requests this channel can handle |