diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-08 21:58:05 +0300 |
| commit | af31ff8a1496c68089c3a2ff50d45c64ec765d34 (patch) | |
| tree | 5671465bb6ba3a17b66ce04eb7fab4220c70a73b /Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt | |
| parent | 535f95d0a6164c60f3c34a0864d653e016decde1 (diff) | |
| parent | 52bddd7cb59adbc9ce56ebd03ad63936cf7cd1e5 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151008.0ll_20151008.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt b/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt index a2114c217376..182777fac9a2 100644 --- a/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt +++ b/Documentation/devicetree/bindings/serial/qcom,msm-uartdm.txt @@ -26,6 +26,12 @@ Required properties: Optional properties: - dmas: Should contain dma specifiers for transmit and receive channels - dma-names: Should contain "tx" for transmit and "rx" for receive channels +- qcom,tx-crci: Identificator <u32> for Client Rate Control Interface to be + used with TX DMA channel. Required when using DMA for transmission + with UARTDM v1.3 and bellow. +- qcom,rx-crci: Identificator <u32> for Client Rate Control Interface to be + used with RX DMA channel. Required when using DMA for reception + with UARTDM v1.3 and bellow. Note: Aliases may be defined to ensure the correct ordering of the UARTs. The alias serialN will result in the UART being assigned port N. If any |