From 4688ef9be7e93f4eb301f509cbcc22512e1bb862 Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Tue, 4 Jul 2017 14:45:25 +0800 Subject: MLK-15330-1: dma: fsl-edma-v3: combine two cells into one For dual fifo case, fsl-edma-v3 need add another cell. It's not friendly for user and it's possible other cells maybe added to other use cases, so combine two cells into one now, and for some special use cases such as dual fifo property can directly be passed by one bit of cell3 rather than another cell. Signed-off-by: Robin Gong (cherry picked from commit 3ecd1b3382e2c746728842fb2c084fbb030eb5de) --- Documentation/devicetree/bindings/dma/fsl-edma-v3.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Documentation/devicetree/bindings/dma') diff --git a/Documentation/devicetree/bindings/dma/fsl-edma-v3.txt b/Documentation/devicetree/bindings/dma/fsl-edma-v3.txt index 322b2c64f396..9c84de7e402c 100644 --- a/Documentation/devicetree/bindings/dma/fsl-edma-v3.txt +++ b/Documentation/devicetree/bindings/dma/fsl-edma-v3.txt @@ -14,12 +14,13 @@ Required properties: - interrupts : A list of interrupt-specifiers, each channel has one interrupt. - interrupt-names : Should contain: "edma-chan12-tx" - the channel12 transmission interrupt -- #dma-cells : Must be <4>. +- #dma-cells : Must be <3>. The 1st cell specifies the channel ID. The 2nd cell specifies the channel priority. - The 3rd cell specifies the channel type like for transmit or receive: + The 3rd cell specifies the channel attributes which include below: + BIT(0): transmit or receive: 0: transmit, 1: receive. - The 4th cell specifies the local access or remote access: + BIT(1): local or remote access: 0: local, 1: remote. See the SoC's reference manual for all the supported request sources. - dma-channels : Number of channels supported by the controller @@ -31,7 +32,7 @@ edma0: dma-controller@40018000 { <0x0 0x5a2d0000 0x0 0x10000>, /* channel13 UART0 tx */ <0x0 0x5a2e0000 0x0 0x10000>, /* channel14 UART1 rx */ <0x0 0x5a2f0000 0x0 0x10000>; /* channel15 UART1 tx */ - #dma-cells = <4>; + #dma-cells = <3>; dma-channels = <4>; interrupts = , , @@ -60,7 +61,7 @@ lpuart1: serial@5a070000 { assigned-clock-rates = <80000000>; power-domains = <&pd_dma_lpuart1>; dma-names = "tx","rx"; - dmas = <&edma0 15 0 0 0>, - <&edma0 14 0 1 0>; + dmas = <&edma0 15 0 0>, + <&edma0 14 0 1>; status = "disabled"; }; -- cgit v1.2.3