| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071 |
- From 28d0ed88f536dd639adf1b0c7c08e04be3c8f294 Mon Sep 17 00:00:00 2001
- From: Thomas Pedersen <[email protected]>
- Date: Mon, 16 May 2016 17:58:50 -0700
- Subject: [PATCH 01/69] dtbindings: qcom_adm: Fix channel specifiers
- Original patch from Andy Gross.
- This patch removes the crci information from the dma
- channel property. At least one client device requires
- using more than one CRCI value for a channel. This does
- not match the current binding and the crci information
- needs to be removed.
- Instead, the client device will provide this information
- via other means.
- Signed-off-by: Andy Gross <[email protected]>
- Signed-off-by: Thomas Pedersen <[email protected]>
- ---
- Documentation/devicetree/bindings/dma/qcom_adm.txt | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
- --- a/Documentation/devicetree/bindings/dma/qcom_adm.txt
- +++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt
- @@ -4,8 +4,7 @@ Required properties:
- - compatible: must contain "qcom,adm" for IPQ/APQ8064 and MSM8960
- - reg: Address range for DMA registers
- - interrupts: Should contain one interrupt shared by all channels
- -- #dma-cells: must be <2>. First cell denotes the channel number. Second cell
- - denotes CRCI (client rate control interface) flow control assignment.
- +- #dma-cells: must be <1>. First cell denotes the channel number.
- - clocks: Should contain the core clock and interface clock.
- - clock-names: Must contain "core" for the core clock and "iface" for the
- interface clock.
- @@ -22,7 +21,7 @@ Example:
- compatible = "qcom,adm";
- reg = <0x18300000 0x100000>;
- interrupts = <0 170 0>;
- - #dma-cells = <2>;
- + #dma-cells = <1>;
-
- clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
- clock-names = "core", "iface";
- @@ -35,15 +34,12 @@ Example:
- qcom,ee = <0>;
- };
-
- -DMA clients must use the format descripted in the dma.txt file, using a three
- +DMA clients must use the format descripted in the dma.txt file, using a two
- cell specifier for each channel.
-
- -Each dmas request consists of 3 cells:
- +Each dmas request consists of two cells:
- 1. phandle pointing to the DMA controller
- 2. channel number
- - 3. CRCI assignment, if applicable. If no CRCI flow control is required, use 0.
- - The CRCI is used for flow control. It identifies the peripheral device that
- - is the source/destination for the transferred data.
-
- Example:
-
- @@ -55,7 +51,7 @@ Example:
-
- cs-gpios = <&qcom_pinmux 20 0>;
-
- - dmas = <&adm_dma 6 9>,
- - <&adm_dma 5 10>;
- + dmas = <&adm_dma 6>,
- + <&adm_dma 5>;
- dma-names = "rx", "tx";
- };
|